[VOL-2602] Removing customization for older ONOS Apps
Change-Id: Iac2f4e0110872256b3038d789638b8f41054cba9
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 9f1672d..7d426ca 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -6,18 +6,13 @@
project: '{name}'
jobs:
- - 'verify-voltha-onos-jobs-common':
+ - 'verify-voltha-onos-jobs':
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-common'
+ name: 'verify-voltha-onos-jobs'
jobs:
- 'verify-licensed'
- 'tag-collision-reject':
@@ -25,21 +20,10 @@
- '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':