Merge "Add new job for openonugo on flex pod and a gpon on menlo"
diff --git a/jjb/pipeline/voltha-scale-multi-stack.groovy b/jjb/pipeline/voltha-scale-multi-stack.groovy
index b751a26..de009cc 100644
--- a/jjb/pipeline/voltha-scale-multi-stack.groovy
+++ b/jjb/pipeline/voltha-scale-multi-stack.groovy
@@ -623,6 +623,12 @@
EXTRA_HELM_FLAGS+="--set images.adapter_open_onu.repository=\$openonuAdapterRepo,images.adapter_open_onu.tag=\$openonuAdapterTag "
fi
+ # OpenONU Go custom image handling
+ if [ '${openonuAdapterGoImg.trim()}' != '' ] && [ '\$GERRIT_PROJECT' != 'voltha-openonu-adapter-go' ]; then
+ IFS=: read -r openonuAdapterGoRepo openonuAdapterGoTag <<< '${openonuAdapterGoImg.trim()}'
+ EXTRA_HELM_FLAGS+="--set use_openonu_adapter_go=true,images.adapter_open_onu_go.repository=\$openonuAdapterGoRepo,images.adapter_open_onu.tag=\$openonuAdapterGoTag "
+ fi
+
# ONOS custom image handling
if [ '${onosImg.trim()}' != '' ] && [ '\$GERRIT_PROJECT' != 'voltha-onos' ]; then
IFS=: read -r onosRepo onosTag <<< '${onosImg.trim()}'
diff --git a/jjb/pipeline/voltha-scale-test.groovy b/jjb/pipeline/voltha-scale-test.groovy
index ac6af3f..ed7e764 100644
--- a/jjb/pipeline/voltha-scale-test.groovy
+++ b/jjb/pipeline/voltha-scale-test.groovy
@@ -249,6 +249,12 @@
EXTRA_HELM_FLAGS+="--set images.adapter_open_onu.repository=\$openonuAdapterRepo,images.adapter_open_onu.tag=\$openonuAdapterTag "
fi
+ # OpenONU GO custom image handling
+ if [ '${openonuAdapterGoImg.trim()}' != '' ] && [ '\$GERRIT_PROJECT' != 'voltha-openonu-adapter-go' ]; then
+ IFS=: read -r openonuAdapterGoRepo openonuAdapterGoTag <<< '${openonuAdapterGoImg.trim()}'
+ EXTRA_HELM_FLAGS+="--set use_openonu_adapter_go=true,images.adapter_open_onu_go.repository=\$openonuAdapterGoRepo,images.adapter_open_onu.tag=\$openonuAdapterGoTag "
+ fi
+
# ONOS custom image handling
if [ '${onosImg.trim()}' != '' ] && [ '\$GERRIT_PROJECT' != 'voltha-onos' ]; then
IFS=: read -r onosRepo onosTag <<< '${onosImg.trim()}'
diff --git a/jjb/voltha-scale.yaml b/jjb/voltha-scale.yaml
index 54d4819..706068f 100644
--- a/jjb/voltha-scale.yaml
+++ b/jjb/voltha-scale.yaml
@@ -25,7 +25,6 @@
withDhcp: false
withIgmp: false
openonuAdapterReplicas: 1
- openonuAdapterImg: voltha/voltha-openonu-adapter-go:master
extraHelmFlags: '--set use_openonu_adapter_go=true'
- 'voltha-scale-measurements':
@@ -42,7 +41,6 @@
withDhcp: true
withIgmp: false
openonuAdapterReplicas: 1
- openonuAdapterImg: voltha/voltha-openonu-adapter-go:master
extraHelmFlags: '--set use_openonu_adapter_go=true,authRetry=true,dhcpRetry=true'
# this job will be used to test custom images without disrupting tests on master
@@ -520,6 +518,11 @@
description: 'Custom image selection for Openonu Adapter (repo:tag)'
- string:
+ name: openonuAdapterGoImg
+ default: '{openonuAdapterGoImg}'
+ description: 'Custom image selection for Openonu Go Adapter (repo:tag)'
+
+ - string:
name: openonuAdapterChart
default: '{openonuAdapterChart}'
description: 'OpenONU chart name (or location on file system)'
@@ -589,6 +592,7 @@
ofAgentImg: voltha/voltha-ofagent-go:master
openoltAdapterImg: voltha/voltha-openolt-adapter:master
openonuAdapterImg: voltha/voltha-openonu-adapter:master
+ openonuAdapterGoImg: voltha/voltha-openonu-adapter-go:master
onosImg: voltha/voltha-onos:master
bbsimChart: onf/bbsim
@@ -690,6 +694,7 @@
ofAgentImg: voltha/voltha-ofagent-go:master
openoltAdapterImg: voltha/voltha-openolt-adapter:master
openonuAdapterImg: voltha/voltha-openonu-adapter:master
+ openonuAdapterGoImg: voltha/voltha-openonu-adapter-go:master
onosImg: voltha/voltha-onos:master
bbsimChart: onf/bbsim