Using dev image in 2.4 pipeline
Change-Id: I49ecd9ac31d6f6f66037b6895eff3b979798b15c
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index 65479e9..d716441 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -175,31 +175,32 @@
export EXTRA_HELM_FLAGS+=' '
- if [ '${release}' == 'master' ]; then
- # BBSim custom image handling
- IFS=: read -r bbsimRepo bbsimTag <<< ${bbsimImg}
- EXTRA_HELM_FLAGS+="--set images.bbsim.repository=\$bbsimRepo,images.bbsim.tag=\$bbsimTag "
-
- # VOLTHA and ofAgent custom image handling
- IFS=: read -r rwCoreRepo rwCoreTag <<< ${rwCoreImg}
- IFS=: read -r ofAgentRepo ofAgentTag <<< ${ofAgentImg}
- EXTRA_HELM_FLAGS+="--set images.rw_core.repository=\$rwCoreRepo,images.rw_core.tag=\$rwCoreTag,images.ofagent.repository=\$ofAgentRepo,images.ofagent.tag=\$ofAgentTag "
-
- # OpenOLT custom image handling
- IFS=: read -r openoltAdapterRepo openoltAdapterTag <<< ${openoltAdapterImg}
- EXTRA_HELM_FLAGS+="--set images.adapter_open_olt.repository=\$openoltAdapterRepo,images.adapter_open_olt.tag=\$openoltAdapterTag "
-
- # OpenONU custom image handling
- IFS=: read -r openonuAdapterRepo openonuAdapterTag <<< ${openonuAdapterImg}
- EXTRA_HELM_FLAGS+="--set images.adapter_open_onu.repository=\$openonuAdapterRepo,images.adapter_open_onu.tag=\$openonuAdapterTag "
-
- # ONOS custom image handling
- IFS=: read -r onosRepo onosTag <<< ${onosImg}
- EXTRA_HELM_FLAGS+="--set images.onos.repository=\$onosRepo,images.onos.tag=\$onosTag "
- else
+ if [ '${release}' -ne 'master' ]; then
source $WORKSPACE/kind-voltha/releases/${release}
fi
+ # BBSim custom image handling
+ IFS=: read -r bbsimRepo bbsimTag <<< ${bbsimImg}
+ EXTRA_HELM_FLAGS+="--set images.bbsim.repository=\$bbsimRepo,images.bbsim.tag=\$bbsimTag "
+
+ # VOLTHA and ofAgent custom image handling
+ IFS=: read -r rwCoreRepo rwCoreTag <<< ${rwCoreImg}
+ IFS=: read -r ofAgentRepo ofAgentTag <<< ${ofAgentImg}
+ EXTRA_HELM_FLAGS+="--set images.rw_core.repository=\$rwCoreRepo,images.rw_core.tag=\$rwCoreTag,images.ofagent.repository=\$ofAgentRepo,images.ofagent.tag=\$ofAgentTag "
+
+ # OpenOLT custom image handling
+ IFS=: read -r openoltAdapterRepo openoltAdapterTag <<< ${openoltAdapterImg}
+ EXTRA_HELM_FLAGS+="--set images.adapter_open_olt.repository=\$openoltAdapterRepo,images.adapter_open_olt.tag=\$openoltAdapterTag "
+
+ # OpenONU custom image handling
+ IFS=: read -r openonuAdapterRepo openonuAdapterTag <<< ${openonuAdapterImg}
+ EXTRA_HELM_FLAGS+="--set images.adapter_open_onu.repository=\$openonuAdapterRepo,images.adapter_open_onu.tag=\$openonuAdapterTag "
+
+ # ONOS custom image handling
+ IFS=: read -r onosRepo onosTag <<< ${onosImg}
+ EXTRA_HELM_FLAGS+="--set images.onos.repository=\$onosRepo,images.onos.tag=\$onosTag "
+
+
# set BBSim parameters
EXTRA_HELM_FLAGS+='--set enablePerf=true,pon=${pons},onu=${onus} '
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index d6b2f76..f0e9ae2 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -243,7 +243,7 @@
release: voltha-2.4
karafHome: apache-karaf-4.2.8
logLevel: INFO
- openoltAdapterImg: matteoscandolo/voltha-rw-core:per-gem-lock
+ openoltAdapterImg: matteoscandolo/voltha-openolt-adapter:per-gem-lock
- 'voltha-scale-measurements':
name: 'voltha-scale-measurements-voltha-2.4-2-16-32-dt-subscribers'
@@ -265,7 +265,7 @@
release: voltha-2.4
karafHome: apache-karaf-4.2.8
logLevel: INFO
- openoltAdapterImg: matteoscandolo/voltha-rw-core:per-gem-lock
+ openoltAdapterImg: matteoscandolo/voltha-openolt-adapter:per-gem-lock
# development pipeline
- 'voltha-scale-measurements-dev':