Sourcing the release file before setting custom EXTRA_HELM_PARAMS in the scale job
Change-Id: I359cff76ff1bc444acf9a4c5f46d91e340513344
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 3f0e14f..b3eb53e 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -58,7 +58,6 @@
NUM_OF_ATOMIX="${atomixReplicas}"
WITH_PPROF="${withProfiling}"
EXTRA_HELM_FLAGS="${extraHelmFlags} " // note that the trailing space is required to separate the parameters from appends done later
-
VOLTHA_CHART="${volthaChart}"
VOLTHA_BBSIM_CHART="${bbsimChart}"
VOLTHA_ADAPTER_OPEN_OLT_CHART="${openoltAdapterChart}"
@@ -174,10 +173,7 @@
cd $WORKSPACE/kind-voltha/
- export EXTRA_HELM_FLAGS+='--set enablePerf=true,pon=${pons},onu=${onus} '
-
- # disable the securityContext, this is a development cluster
- EXTRA_HELM_FLAGS+='--set securityContext.enabled=false '
+ export EXTRA_HELM_FLAGS+=' '
if [ '${release}' == 'master' ]; then
# BBSim custom image handling
@@ -204,6 +200,12 @@
source $WORKSPACE/kind-voltha/releases/${release}
fi
+ # set BBSim parameters
+ EXTRA_HELM_FLAGS+='--set enablePerf=true,pon=${pons},onu=${onus} '
+
+ # disable the securityContext, this is a development cluster
+ EXTRA_HELM_FLAGS+='--set securityContext.enabled=false '
+
# No persistent-volume-claims in Atomix
EXTRA_HELM_FLAGS+="--set atomix.persistence.enabled=false "
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 816b41a..a55d91f 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -428,7 +428,7 @@
- string:
name: extraHelmFlags
default: '{extraHelmFlags}'
- description: 'Any extra helm parameters you want (passed to every helm install command)'
+ description: 'Any extra helm parameters you want (passed to every helm install command, not available if release != master)'
- string:
name: openonuAdapterReplicas