Merge "[VOL-3780] Moving all periodic BBSim based jobs to use the same pipeline"
diff --git a/jjb/pipeline/voltha/master/tucson-build-and-test.groovy b/jjb/pipeline/voltha/master/tucson-build-and-test.groovy
index d400681..f2070fe 100644
--- a/jjb/pipeline/voltha/master/tucson-build-and-test.groovy
+++ b/jjb/pipeline/voltha/master/tucson-build-and-test.groovy
@@ -114,15 +114,15 @@
if (volthaHelmChartsChange != "" || gerritProject == "voltha-helm-charts") {
localCharts = true
}
- def extraHelmFlags = "-f $WORKSPACE/${configBaseDir}/${configKubernetesDir}/voltha/${configFileName}.yml ${imageFlags} "
+ def flags = "-f $WORKSPACE/${configBaseDir}/${configKubernetesDir}/voltha/${configFileName}.yml ${imageFlags} "
// NOTE temporary workaround expose ONOS node ports (pod-config needs to be updated to contain these values)
- extraHelmFlags = extraHelmFlags + "--set onos-classic.onosSshPort=30115 " +
+ flags = flags + "--set onos-classic.onosSshPort=30115 " +
"--set onos-classic.onosApiPort=30120 " +
"--set onos-classic.onosOfPort=31653 " +
- "--set onos-classic.individualOpenFlowNodePorts=true "
+ "--set onos-classic.individualOpenFlowNodePorts=true " + extraHelmFlags
volthaDeploy([
workflow: workFlow.toLowerCase(),
- extraHelmFlags: extraHelmFlags,
+ extraHelmFlags: flags,
localCharts: localCharts,
kubeconfig: "$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf",
onosReplica: 3,
diff --git a/jjb/pipeline/voltha/voltha-2.7/voltha-openonu-go-test-bbsim.groovy b/jjb/pipeline/voltha/voltha-2.7/voltha-openonu-go-test-bbsim.groovy
index 7842559..a82b9f1 100755
--- a/jjb/pipeline/voltha/voltha-2.7/voltha-openonu-go-test-bbsim.groovy
+++ b/jjb/pipeline/voltha/voltha-2.7/voltha-openonu-go-test-bbsim.groovy
@@ -147,6 +147,13 @@
cd $WORKSPACE/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
+ export EXTRA_HELM_FLAGS=""
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
# start logging
@@ -185,6 +192,13 @@
cd $WORKSPACE/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
+ export EXTRA_HELM_FLAGS=""
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
# start logging
@@ -224,8 +238,14 @@
cd $WORKSPACE/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
+ export EXTRA_HELM_FLAGS=""
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
-
export EXTRA_HELM_FLAGS+="--set pon=2,onu=2,controlledActivation=only-onu "
# start logging
@@ -264,6 +284,13 @@
cd $WORKSPACE/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
+ export EXTRA_HELM_FLAGS=""
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
# Workflow-specific flags
@@ -309,6 +336,13 @@
cd $WORKSPACE/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
+ export EXTRA_HELM_FLAGS=""
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
# Workflow-specific flags
@@ -360,6 +394,13 @@
cd $WORKSPACE/kind-voltha/
WAIT_ON_DOWN=y DEPLOY_K8S=n ./voltha down
+ export EXTRA_HELM_FLAGS=""
+ if [ "${branch}" != "master" ]; then
+ echo "on branch: ${branch}, sourcing kind-voltha/releases/${branch}"
+ source "$WORKSPACE/kind-voltha/releases/${branch}"
+ else
+ echo "on master, using default settings for kind-voltha"
+ fi
export EXTRA_HELM_FLAGS+="--set log_agent.enabled=False ${extraHelmFlags} "
# Workflow-specific flags
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 665bb3f..edd3412 100755
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -380,6 +380,7 @@
- 'verify_physical_voltha_patchset_auto':
name: 'verify_physical_voltha_patchset_auto'
default-test-args: '-i sanityORDeleteOLT -i PowerSwitch -X'
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
# Per-patchset Pod builds on Tucson pod (voltha-2.7)
- 'verify_physical_voltha_patchset_auto':
@@ -397,6 +398,7 @@
trigger-string: 'hardware test'
default-test-args: '-i sanityORDeleteOLT -i PowerSwitch -X'
branch-pattern: master
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
# Per-patchset Pod builds on Tucson pod (master)
@@ -408,6 +410,7 @@
trigger-string: 'DT hardware test'
default-test-args: '-i sanityDt -i PowerSwitch -X'
branch-pattern: master
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
# Per-patchset Pod builds on Tucson pod (voltha-2.7)
- 'verify_physical_voltha_patchset_manual':
@@ -443,6 +446,7 @@
oltDebVersionVoltha23: 'openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb'
profile: 'Default'
default-test-args: '-i sanityORDeleteOLT -i PowerSwitch -X'
+ extraHelmFlags: '--set global.image_tag=master --set onos-classic.image.tag=master'
- job-template:
id: 'voltha-periodic-test'
@@ -936,6 +940,11 @@
default: '{workflow}'
description: 'Installs and uses the specified work flow on the POD'
+ - string:
+ name: extraHelmFlags
+ default: '{extraHelmFlags}'
+ description: 'Helm flags (passed to each helm command)'
+
# deprecated parameters, remove after VOLTHA-2.8 is released
- string:
name: deploymentConfigFile
@@ -998,6 +1007,7 @@
oltDebVersionVoltha23: 'openolt_asfvolt16-3.3.3-1a5d68b50d8bcc5ba6cb1630d3294c30c37cd2f5-40G-NNI.deb'
volthaSystemTestsChange: ''
volthaHelmChartsChange: ''
+ extraHelmFlags: ''
properties:
- cord-infra-properties:
@@ -1051,6 +1061,7 @@
volthaSystemTestsChange: ''
volthaHelmChartsChange: ''
workflow: 'att'
+ extraHelmFlags: ''
properties:
- cord-infra-properties: