[VOL-3780] Upgrading per-patchset validation to use the new charts
Change-Id: I1858f22032dd7b00215f3af0b2ffb038d1615cc2
diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index 5cdbc5c..4abebd2 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -8,6 +8,11 @@
jobs:
- 'verify-bbsim-sadis-server-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-bbsim-sadis-server-jobs-voltha-2.6':
+ name-extension: '-voltha-2.6'
+ branch-regexp: '{kind-voltha-regexp}'
+ - 'verify-bbsim-sadis-server-jobs-master':
+ branch-regexp: '^master$'
- 'publish-bbsim-sadis-server-jobs':
branch-regexp: '{all-branches-regexp}'
@@ -22,10 +27,20 @@
dest-gopath: "github.com/opencord"
unit-test-targets: 'lint sca test'
unit-test-keep-going: 'true'
+
+- job-group:
+ name: 'verify-bbsim-sadis-server-jobs-voltha-2.6'
+ jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
+ name: 'verify-bbsim-sadis-server-jobs-master'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/master/bbsim-tests.groovy'
+
+- job-group:
name: 'publish-bbsim-sadis-server-jobs'
jobs:
- 'docker-publish':
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index 1310f01..14553c0 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -8,6 +8,12 @@
jobs:
- 'verify-bbsim-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-bbsim-jobs-voltha-2.6':
+ name-extension: '-voltha-2.6'
+ override-branch: 'voltha-2.6'
+ branch-regexp: '{kind-voltha-regexp}'
+ - 'verify-bbsim-jobs-master':
+ branch-regexp: '^master$'
- 'publish-bbsim-jobs':
branch-regexp: '{all-branches-regexp}'
@@ -22,10 +28,20 @@
dest-gopath: "github.com/opencord"
unit-test-targets: 'lint sca test'
unit-test-keep-going: 'true'
+
+- job-group:
+ name: 'verify-bbsim-jobs-voltha-2.6'
+ jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
+ name: 'verify-bbsim-jobs-master'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/master/bbsim-tests.groovy'
+
+- job-group:
name: 'publish-bbsim-jobs'
jobs:
- 'docker-publish':
diff --git a/jjb/verify/kind-voltha.yaml b/jjb/verify/kind-voltha.yaml
index e66be45..952b1c0 100644
--- a/jjb/verify/kind-voltha.yaml
+++ b/jjb/verify/kind-voltha.yaml
@@ -17,6 +17,7 @@
- 'make-unit-test':
unit-test-targets: 'test'
junit-allow-empty-results: true
+ # Remove kind-voltha test on master once we are not depending on it anymore
- 'voltha-patch-test':
pipeline-script: 'voltha-bbsim-tests.groovy'
- 'voltha-patch-test':
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index 0c7aa13..f3475ee 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -8,6 +8,12 @@
jobs:
- 'verify-ofagent-go-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-ofagent-jobs-voltha-2.6':
+ name-extension: '-voltha-2.6'
+ override-branch: 'voltha-2.6'
+ branch-regexp: '{kind-voltha-regexp}'
+ - 'verify-ofagent-jobs-master':
+ branch-regexp: '^master$'
- 'publish-ofagent-go-jobs':
branch-regexp: '{all-branches-regexp}'
@@ -23,10 +29,20 @@
unit-test-targets: 'lint sca test'
unit-test-keep-going: 'true'
junit-allow-empty-results: true
+
+- job-group:
+ name: 'verify-ofagent-jobs-voltha-2.6'
+ jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
+ name: 'verify-ofagent-jobs-master'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/master/bbsim-tests.groovy'
+
+- job-group:
name: 'publish-ofagent-go-jobs'
jobs:
- 'docker-publish':
diff --git a/jjb/verify/ofagent-py.yaml b/jjb/verify/ofagent-py.yaml
index 2a5ea78..733cbf7 100644
--- a/jjb/verify/ofagent-py.yaml
+++ b/jjb/verify/ofagent-py.yaml
@@ -1,6 +1,8 @@
---
# verification jobs for 'ofagent-py' repo
+# NOTE ofagent-py is unmaintained, should we keep running tests?
+
- project:
name: ofagent-py
project: '{name}'
diff --git a/jjb/verify/voltctl.yaml b/jjb/verify/voltctl.yaml
index 74c98e2..d7fca71 100644
--- a/jjb/verify/voltctl.yaml
+++ b/jjb/verify/voltctl.yaml
@@ -25,7 +25,7 @@
unit-test-keep-going: 'true'
dependency-jobs: 'verify_voltctl_tag-collision'
- 'voltha-patch-test':
- pipeline-script: 'voltha-bbsim-tests.groovy'
+ pipeline-script: 'voltha/master/bbsim-tests.groovy'
- job-group:
name: 'post-submit-voltctl-jobs'
diff --git a/jjb/verify/voltha-api-server.yaml b/jjb/verify/voltha-api-server.yaml
index 2e379fc..a0dea40 100644
--- a/jjb/verify/voltha-api-server.yaml
+++ b/jjb/verify/voltha-api-server.yaml
@@ -1,6 +1,8 @@
---
# verification jobs for 'voltha-api-server' repo
+# NOTE voltha-api-server is unmaintained, should we keep running tests?
+
- project:
name: voltha-api-server
project: '{name}'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 3ae3bc6..bfefd07 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -8,6 +8,12 @@
jobs:
- 'verify-voltha-go-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-voltha-go-jobs-voltha-2.6':
+ name-extension: '-voltha-2.6'
+ override-branch: 'voltha-2.6'
+ branch-regexp: '{kind-voltha-regexp}'
+ - 'verify-voltha-go-jobs-master':
+ branch-regexp: '^master$'
- 'publish-voltha-go-jobs':
branch-regexp: '{all-branches-regexp}'
@@ -31,10 +37,20 @@
name-extension: "-tests"
unit-test-targets: 'test'
unit-test-keep-going: 'true'
+
+- job-group:
+ name: 'verify-voltha-go-jobs-voltha-2.6'
+ jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
+ name: 'verify-voltha-go-jobs-master'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/master/bbsim-tests.groovy'
+
+- job-group:
name: 'publish-voltha-go-jobs'
jobs:
- 'docker-publish':
diff --git a/jjb/verify/voltha-helm-charts.yaml b/jjb/verify/voltha-helm-charts.yaml
index 6301abe..77b8dc4 100644
--- a/jjb/verify/voltha-helm-charts.yaml
+++ b/jjb/verify/voltha-helm-charts.yaml
@@ -8,6 +8,12 @@
jobs:
- 'verify-voltha-helm-charts-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-voltha-helm-charts-jobs-voltha-2.6':
+ name-extension: '-voltha-2.6'
+ override-branch: 'voltha-2.6'
+ branch-regexp: '{kind-voltha-regexp}'
+ - 'verify-voltha-helm-charts-jobs-master':
+ branch-regexp: '^master$'
- job-group:
name: 'verify-voltha-helm-charts-jobs'
@@ -17,7 +23,15 @@
dependency-jobs: 'verify_voltha-helm-charts_licensed'
- 'verify-helm-lint':
dependency-jobs: 'verify_voltha-helm-charts_tag-collision'
+
+- job-group:
+ name: 'verify-voltha-helm-charts-jobs-voltha-2.6'
+ jobs:
- 'voltha-patch-test':
- dependency-jobs: 'verify_voltha-helm-charts_helm-lint'
- build-timeout: 20
pipeline-script: 'voltha-bbsim-tests.groovy'
+
+- job-group:
+ name: 'verify-voltha-helm-charts-jobs-master'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/master/bbsim-tests.groovy'
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':
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 6f9c4c8..6e845a8 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -8,6 +8,12 @@
jobs:
- 'verify-voltha-openolt-adapter-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-voltha-openolt-adapter-jobs-voltha-2.6':
+ name-extension: '-voltha-2.6'
+ override-branch: 'voltha-2.6'
+ branch-regexp: '{kind-voltha-regexp}'
+ - 'verify-voltha-openolt-adapter-jobs-master':
+ branch-regexp: '^master$'
- 'publish-voltha-openolt-adapter-jobs':
branch-regexp: '{all-branches-regexp}'
@@ -31,10 +37,20 @@
unit-test-keep-going: 'true'
junit-allow-empty-results: true
build-node: 'ubuntu16.04-basebuild-2c-4g'
+
+- job-group:
+ name: 'verify-voltha-openolt-adapter-jobs-voltha-2.6'
+ jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
+ name: 'verify-voltha-openolt-adapter-jobs-master'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/master/bbsim-tests.groovy'
+
+- job-group:
name: 'publish-voltha-openolt-adapter-jobs'
jobs:
- 'docker-publish':
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index c55dabd..de5ca20 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -8,6 +8,12 @@
jobs:
- 'verify-voltha-openonu-adapter-go-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.6':
+ name-extension: '-voltha-2.6'
+ override-branch: 'voltha-2.6'
+ branch-regexp: '{kind-voltha-regexp}'
+ - 'verify-voltha-openonu-adapter-go-jobs-master':
+ branch-regexp: '^master$'
- 'publish-voltha-openonu-adapter-go-jobs':
branch-regexp: '{all-branches-regexp}'
@@ -30,8 +36,18 @@
unit-test-keep-going: 'true'
junit-allow-empty-results: true
build-node: 'ubuntu16.04-basebuild-2c-4g'
+
+- job-group:
+ name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.6'
+ jobs:
- 'voltha-patch-test':
- pipeline-script: 'voltha-openonu-go-tests.groovy'
+ pipeline-script: 'voltha-bbsim-tests.groovy'
+
+- job-group:
+ name: 'verify-voltha-openonu-adapter-go-jobs-master'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/master/bbsim-tests.groovy'
- job-group:
name: 'publish-voltha-openonu-adapter-go-jobs'
diff --git a/jjb/verify/voltha-openonu-adapter.yaml b/jjb/verify/voltha-openonu-adapter.yaml
index 68bee87..65afee2 100644
--- a/jjb/verify/voltha-openonu-adapter.yaml
+++ b/jjb/verify/voltha-openonu-adapter.yaml
@@ -8,6 +8,12 @@
jobs:
- 'verify-voltha-openonu-adapter-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-voltha-openonu-adapter-jobs-voltha-2.6':
+ name-extension: '-voltha-2.6'
+ override-branch: 'voltha-2.6'
+ branch-regexp: '{kind-voltha-regexp}'
+ - 'verify-voltha-openonu-adapter-jobs-master':
+ branch-regexp: '^master$'
- 'publish-voltha-openonu-adapter-jobs':
branch-regexp: '{all-branches-regexp}'
@@ -27,10 +33,20 @@
unit-test-keep-going: 'true'
junit-allow-empty-results: true
build-timeout: 15
+
+- job-group:
+ name: 'verify-voltha-openonu-adapter-jobs-voltha-2.6'
+ jobs:
- 'voltha-patch-test':
pipeline-script: 'voltha-bbsim-tests.groovy'
- job-group:
+ name: 'verify-voltha-openonu-adapter-jobs-master'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/master/bbsim-tests.groovy'
+
+- job-group:
name: 'publish-voltha-openonu-adapter-jobs'
jobs:
- 'docker-publish':
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index 724589c..937c388 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -8,6 +8,12 @@
jobs:
- 'verify-voltha-system-tests-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-voltha-system-tests-jobs-voltha-2.6':
+ name-extension: '-voltha-2.6'
+ override-branch: 'voltha-2.6'
+ branch-regexp: '{kind-voltha-regexp}'
+ - 'verify-voltha-system-tests-jobs-master':
+ branch-regexp: '^master$'
- job-group:
name: 'verify-voltha-system-tests-jobs'
@@ -19,7 +25,15 @@
dependency-jobs: 'verify_voltha-system-tests_tag-collision'
unit-test-targets: 'lint'
junit-allow-empty-results: true
+
+- job-group:
+ name: 'verify-voltha-system-tests-jobs-voltha-2.6'
+ jobs:
- 'voltha-patch-test':
- build-timeout: 20
pipeline-script: 'voltha-bbsim-tests.groovy'
- dependency-jobs: 'verify_voltha-system-tests_unit-test'
+
+- job-group:
+ name: 'verify-voltha-system-tests-jobs-master'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/master/bbsim-tests.groovy'