VOL-2871 Fix bug, run sanity on both master and voltha-2.3 branch
Change-Id: I580c9f84b5d26f657565d3631bfa787572b51a3f
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index c0d8b71..83ab621 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -118,7 +118,7 @@
export GOPATH=\${GOPATH:-$WORKSPACE/go}
export PATH=\$PATH:/usr/lib/go-1.12/bin:/usr/local/go/bin:\$GOPATH/bin
make -C $WORKSPACE/voltha/voltctl/ build
- elif ! [[ "${gerritProject}" =~ ^(voltha-helm-charts|voltha-system-tests)\$ ]]; then
+ elif ! [[ "${gerritProject}" =~ ^(voltha-helm-charts|voltha-system-tests|kind-voltha)\$ ]]; then
make-local ${gerritProject}
fi
"""
diff --git a/jjb/verify/kind-voltha.yaml b/jjb/verify/kind-voltha.yaml
index 428e6ec..155728a 100644
--- a/jjb/verify/kind-voltha.yaml
+++ b/jjb/verify/kind-voltha.yaml
@@ -14,3 +14,7 @@
jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha-bbsim-tests.groovy'
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha-bbsim-tests.groovy'
+ name-extension: '-2.3'
+ override-branch: 'voltha-2.3'
diff --git a/jjb/voltha-e2e.yaml b/jjb/voltha-e2e.yaml
index 439c794..e25d4be 100644
--- a/jjb/voltha-e2e.yaml
+++ b/jjb/voltha-e2e.yaml
@@ -261,6 +261,7 @@
- job-template:
id: 'voltha-patch-test'
name: 'verify_{project}_sanity-test{name-extension}'
+ override-branch: '$GERRIT_BRANCH'
description: |
<!-- Managed by Jenkins Job Builder -->
@@ -290,7 +291,7 @@
- string:
name: branch
- default: '$GERRIT_BRANCH'
+ default: '{override-branch}'
description: 'Name of the branch to use'
- string: