Merge "supporting custom images on voltha-scale-measurements-pipeline"
diff --git a/jjb/pipeline/voltha-scale-measurements.groovy b/jjb/pipeline/voltha-scale-measurements.groovy
index e58b19c..cc7c160 100644
--- a/jjb/pipeline/voltha-scale-measurements.groovy
+++ b/jjb/pipeline/voltha-scale-measurements.groovy
@@ -55,11 +55,18 @@
steps {
sh '''
helm install -n onos onf/onos --set images.onos.repository=voltha/voltha-onos --set images.onos.tag=4.0.1
- helm install -n voltha onf/voltha -f /home/cord/voltha-scale/voltha-values.yaml
- helm install -n openolt onf/voltha-adapter-openolt -f /home/cord/voltha-scale/voltha-values.yaml
- helm install -n openonu onf/voltha-adapter-openonu -f /home/cord/voltha-scale/voltha-values.yaml
- helm install -n bbsim onf/bbsim --set pon=${ponPorts},onu=${onuPerPon},auth=${bbsimAuth},dhcp=${bbsimDhcp},delay=${BBSIMdelay}
+ IFS=: read -r volthaRepo volthaTag <<< ${volthaImg}
+ helm install -n voltha onf/voltha -f /home/cord/voltha-scale/voltha-values.yaml --set images.voltha.repository=${volthaRepo},images.voltha.tag=${volthaTag}
+
+ IFS=: read -r openoltAdapterRepo openoltAdapterTag <<< ${openoltAdapterImg}
+ helm install -n openolt onf/voltha-adapter-openolt -f /home/cord/voltha-scale/voltha-values.yaml --set images.adapter_open_olt.repository=${openoltAdapterRepo},images.adapter_open_olt.tag=${openoltAdapterTag}
+
+ IFS=: read -r openonuAdapterRepo openonuAdapterTag <<< ${openonuAdapterImg}
+ helm install -n openonu onf/voltha-adapter-openonu -f /home/cord/voltha-scale/voltha-values.yaml --set images.adapter_open_olt.repository=${openonuAdapterRepo},images.adapter_open_olt.tag=${openonuAdapterTag}
+
+ IFS=: read -r bbsimRepo bbsimTag <<< ${bbsimImg}
+ helm install -n bbsim onf/bbsim --set pon=${ponPorts},onu=${onuPerPon},auth=${bbsimAuth},dhcp=${bbsimDhcp},delay=${BBSIMdelay},images.bbsim.repository=${bbsimRepo},images.bbsim.tag=${bbsimTag}
helm install -n radius onf/freeradius
if [ ! -z ${bbsimImg} ];
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index f150d04..9309bbe 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -216,12 +216,12 @@
- string:
name: bbsimImg
- default:
+ default: 'voltha/bbsim:master'
description: 'Custom image selection for BBSIM (repo:tag)'
- string:
name: volthaImg
- default:
+ default: 'voltha/voltha-rw-core:master'
description: 'Custom image selection for VOLTHA (repo:tag)'
project-type: pipeline
@@ -323,14 +323,24 @@
- string:
name: bbsimImg
- default:
+ default: voltha/bbsim:master
description: 'Custom image selection for BBSIM (repo:tag)'
- string:
name: volthaImg
- default:
+ default: voltha/voltha-rw-core:master
description: 'Custom image selection for VOLTHA (repo:tag)'
+ - string:
+ name: openoltAdapterImg
+ default: voltha/voltha-openolt-adapter:master
+ description: 'Custom image selection for Openolt Adapter (repo:tag)'
+
+ - string:
+ name: openonuAdapterImg
+ default: voltha/voltha-openonu-adapter:master
+ description: 'Custom image selection for Openonu Adapter (repo:tag)'
+
project-type: pipeline
concurrent: false