Adding support for voltha-onos 1.13.10 and 2.2 to BBSim based sanity test
The support is not directly related to the ONOS version itself, but to
the version of the apps that come bundled with those version
Change-Id: I2a09c4f01b0ba300902366d6ba0fc814464eddb2
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 7d426ca..9f1672d 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -6,13 +6,18 @@
project: '{name}'
jobs:
- - 'verify-voltha-onos-jobs':
+ - 'verify-voltha-onos-jobs-common':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-voltha-onos-jobs-master':
+ branch-regexp: 'master'
+ - 'verify-voltha-onos-jobs-branches':
+ branch-regexp: '^(onos-1.13.10|onos-2.2)$'
+ name-extension: '-branches'
- 'publish-voltha-onos-jobs':
- branch-regexp: '{all-branches-regexp}'
+ branch-regexp: '{all-branches-regexp}'
- job-group:
- name: 'verify-voltha-onos-jobs'
+ name: 'verify-voltha-onos-jobs-common'
jobs:
- 'verify-licensed'
- 'tag-collision-reject':
@@ -20,10 +25,21 @@
- 'make-unit-test':
unit-test-targets: 'build'
junit-allow-empty-results: true
+
+- job-group:
+ name: 'verify-voltha-onos-jobs-master'
+ jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
+ name: 'verify-voltha-onos-jobs-branches'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha-bbsim-tests.groovy'
+ onos-version: '1.13.10'
+
+- job-group:
name: 'publish-voltha-onos-jobs'
jobs:
- 'docker-publish':