Merge "[VOL-2944] Support worflow parameter in test jobs"
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index a06ac4f..b6da315 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -40,6 +40,7 @@
jobs:
- 'omec-combined':
pipeline-file: 'Jenkinsfile-omec-combined.groovy'
+ mme-repo: 'openmme'
- 'omec-install':
sub-project: '{name}'
branch: 'central-cp-multi-upfs'
@@ -71,6 +72,7 @@
jobs:
- 'omec-combined':
pipeline-file: 'Jenkinsfile-omec-combined.groovy'
+ mme-repo: 'openmme'
- 'omec-install':
sub-project: 'c3po-sgx'
branch: 'master'
@@ -106,6 +108,7 @@
jobs:
- 'omec-combined':
pipeline-file: 'Jenkinsfile-omec-combined.groovy'
+ mme-repo: 'openmme'
- 'omec-install':
sub-project: '{name}'
branch: 'paging'
@@ -135,6 +138,13 @@
- 'omec-project'
jobs:
+ - 'omec-combined':
+ pipeline-file: 'Jenkinsfile-omec-combined.groovy'
+ mme-repo: 'Nucleus'
+ - 'omec-install':
+ sub-project: '{name}'
+ branch: 'master'
+ pipeline-file: 'Jenkinsfile-omec-install-Nucleus-vnf.groovy'
- 'omec-fossa':
pipeline-file: 'omec-fossa-scan.groovy'
build-node: 'omec-qa'
@@ -244,6 +254,11 @@
default: '{project}'
description: 'Name of the project'
+ - string:
+ name: mmeRepo
+ default: '{mme-repo}'
+ description: 'Name of the MME repo to test (openmme/Nucleus)'
+
triggers:
- cord-infra-github-pr-trigger:
github_pr_org_list: '{obj:github_pr_org_list}'
@@ -422,6 +437,11 @@
default: '{build-node}'
description: 'Name of the Jenkins executor node to run the job on'
+ - string:
+ name: mmeRepo
+ default: 'openmme'
+ description: 'Name of the MME repo to test (openmme/Nucleus)'
+
concurrent: false
pipeline-scm:
@@ -457,6 +477,11 @@
default: '{build-node}'
description: 'Name of the Jenkins executor node to run the job on'
+ - string:
+ name: mmeRepo
+ default: 'openmme'
+ description: 'Name of the MME repo to test (openmme/Nucleus)'
+
concurrent: false
pipeline-scm:
diff --git a/jjb/pipeline/voltha-scale-measurements.groovy b/jjb/pipeline/voltha-scale-measurements.groovy
index e7b4f85..f935bde 100644
--- a/jjb/pipeline/voltha-scale-measurements.groovy
+++ b/jjb/pipeline/voltha-scale-measurements.groovy
@@ -5,10 +5,7 @@
label "${params.buildNode}"
}
environment {
- KUBECONFIG="$HOME/.kube/kind-config-voltha-minimal"
- VOLTCONFIG="$HOME/.volt/config-minimal"
SSHPASS="karaf"
- DEPLOY_K8S="n"
}
stages {
stage('set-description') {