Abandoning voltha-2.1 branch
Change-Id: I6f5ebc2ff8ae32869c153c65d07c94ab7aa43c61
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 8dbfa63..1922dbd 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -71,7 +71,6 @@
modern-branches-regexp: '^(master|cord-7.0|cord-6.1|cord-6.0|seba-1.0)$'
platform-branches-regexp: '^(master|cord-7.0|cord-6.1)$'
seba-branches-regexp: '^(master|cord-7.0|seba-1.0)$'
- voltha-stablization-branch: '^(voltha-2.1)$'
# matchs all project repos
all-projects-regexp: '.*'
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
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index f7e5716..55543d6 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -10,10 +10,6 @@
- 'voltha-periodic-test':
name: 'voltha-system-tests'
pipeline: 'voltha-go-tests.groovy'
- default-image-tag: 'voltha-2.1'
- - 'voltha-periodic-test':
- name: 'voltha-system-tests-master'
- pipeline: 'voltha-go-tests.groovy'
default-image-tag: 'master'
- job-template:
@@ -63,7 +59,7 @@
- string:
name: extraHelmFlags
- default: '--set defaults.image_tag={default-image-tag},images.afrouter.tag=master,images.afrouterd.tag=master,wpa_wait=10,dhcp_wait=10'
+ default: '--set defaults.image_tag={default-image-tag}'
description: 'Helm flags to pass to ./voltha up'
project-type: pipeline
@@ -146,6 +142,11 @@
default: '-e notready'
description: 'test tags'
+ - string:
+ name: extraHelmFlags
+ default: '--set defaults.image_tag=$GERRIT_BRANCH'
+ description: 'Helm flags to pass to ./voltha up'
+
project-type: pipeline
concurrent: true