[VOL-3780] Upgrading per-patchset validation to use the new charts
Change-Id: I1858f22032dd7b00215f3af0b2ffb038d1615cc2
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index c28e5b4..5d5dd88 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -8,6 +8,12 @@
jobs:
- 'verify-voltha-onos-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-voltha-onos-jobs-voltha-2.6':
+ name-extension: '-voltha-2.6'
+ override-branch: 'voltha-2.6'
+ branch-regexp: '{kind-voltha-regexp}'
+ - 'verify-voltha-onos-jobs-master':
+ branch-regexp: '^master$'
- 'publish-voltha-onos-jobs':
branch-regexp: '{all-branches-regexp}'
@@ -17,15 +23,20 @@
- 'verify-licensed'
- 'tag-collision-reject':
dependency-jobs: 'verify_voltha-onos_licensed'
- # No need to build the container as part of the unit-tests as it's
- # built in 'voltha-patch-test'
- # - 'make-unit-test':
- # unit-test-targets: 'build'
- # junit-allow-empty-results: true
+
+- job-group:
+ name: 'verify-voltha-onos-jobs-voltha-2.6'
+ jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
+ name: 'verify-voltha-onos-jobs-master'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/master/bbsim-tests.groovy'
+
+- job-group:
name: 'publish-voltha-onos-jobs'
jobs:
- 'docker-publish':