Abandoning voltha-2.1 branch
Change-Id: I6f5ebc2ff8ae32869c153c65d07c94ab7aa43c61
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 7fe97dd..58fe4a8 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -95,7 +95,7 @@
stage('Deploy Voltha') {
steps {
sh '''
- HELM_FLAG="--set defaults.image_tag=voltha-2.1,wpa_wait=10,dhcp_wait=10 "
+ HELM_FLAG="${params.extraHelmFlags} "
if [ "${gerritProject}" = "voltha-go" ]; then
HELM_FLAG+="-f $WORKSPACE/voltha/voltha-system-tests/tests/data/ci-test.yaml "
@@ -116,7 +116,7 @@
if [ "${gerritProject}" = "voltha-api-server" ]; then
HELM_FLAG+="--set images.afrouter.tag=citest,images.afrouter.pullPolicy=Never,images.afrouterd.tag=citest,images.afrouterd.pullPolicy=Never "
else
- # afrouter is disaggregated from the core, and lacks voltha-2.1 tags
+ # afrouter only has master branch at present
HELM_FLAG+="--set images.afrouter.tag=master,images.afrouterd.tag=master "
fi