commit bb7382dc8256755705f4d52fd51bcc64a025692a
author Matteo Scandolo <matteo.scandolo@gmail.com> Wed May 05 08:32:35 2021 -0700
committer Matteo Scandolo <teo@opennetworking.org> Wed May 05 17:27:10 2021 +0000
tree f29036c6239d5846a9fb95ec5d2ac30a0d99df98
parent ee626e08e5ab97f0b6ed9e1f813329f04babc658

[VOL-3780] Using master images on Tucson POD by default

Change-Id: Icdd8ca557a7641bfa0eec0482a413b6ef29f71a0

jjb/pipeline/voltha/master/tucson-build-and-test.groovy

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,