commit d3247aeb8a079ba61afbe8dc5635f6300002766d
author Matteo Scandolo <matteo.scandolo@gmail.com> Wed Apr 07 12:55:55 2021 -0700
committer Matteo Scandolo <matteo.scandolo@gmail.com> Wed Apr 07 12:56:57 2021 -0700
tree e2d2760ca77e90f2ee0fbe60fd69c67ec27921d3
parent 238bd366268e78ab461a0ceae5e640b2d2720001

Always add extraHelmFlags at the end

Change-Id: I461ebb82c54a26eec9efd7b1b331e2a20b7e8ac2

jjb/pipeline/voltha/master/voltha-scale-test.groovy

diff --git a/jjb/pipeline/voltha/master/voltha-scale-test.groovy b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
index d4f2252..818e24d 100644
--- a/jjb/pipeline/voltha/master/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha/master/voltha-scale-test.groovy
@@ -49,7 +49,7 @@
     NUM_OF_OPENONU="${openonuAdapterReplicas}"
     NUM_OF_ONOS="${onosReplicas}"
     NUM_OF_ATOMIX="${atomixReplicas}"
-    EXTRA_HELM_FLAGS="${extraHelmFlags} " // note that the trailing space is required to separate the parameters from appends done later
+    EXTRA_HELM_FLAGS=" "
 
     APPS_TO_LOG="etcd kafka onos-classic adapter-open-onu adapter-open-olt rw-core ofagent bbsim radius bbsim-sadis-server onos-config-loader"
     LOG_FOLDER="$WORKSPACE/logs"
@@ -271,11 +271,11 @@
 
             """).trim()
 
-            def extraHelmFlags = returned_flags + " -f $WORKSPACE/voltha-helm-charts/examples/${workflow}-values.yaml "
+            def extraHelmFlags = returned_flags
             def infraHelmFlags =
               " --set etcd.enabled=false,kafka.enabled=false" +
               " --set global.log_level=${logLevel} " +
-              extraHelmFlags
+              extraHelmFlags + params.extraHelmFlags
 
             println "Passing the following parameters to the VOLTHA infra deploy: ${infraHelmFlags}."