Migrate more v2.8 targets for v2.11 use
Change-Id: I8403c3eb47469db675ea6a07e7195fd988704d7f
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index 4e37059..8d07294 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -8,6 +8,10 @@
jobs:
- 'verify-ofagent-go-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-ofagent-jobs-voltha-2.11':
+ name-extension: '-voltha-2.11'
+ override-branch: 'voltha-2.11'
+ branch-regexp: '{kind-voltha-regexp}'
- 'verify-ofagent-jobs-voltha-2.8':
name-extension: '-voltha-2.8'
override-branch: 'voltha-2.8'
@@ -31,6 +35,12 @@
junit-allow-empty-results: true
- job-group:
+ name: 'verify-ofagent-jobs-voltha-2.11'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+
+- job-group:
name: 'verify-ofagent-jobs-voltha-2.8'
jobs:
- 'voltha-patch-test':
diff --git a/jjb/verify/voltha-api-server.yaml b/jjb/verify/voltha-api-server.yaml
index 2892fc1..951e679 100644
--- a/jjb/verify/voltha-api-server.yaml
+++ b/jjb/verify/voltha-api-server.yaml
@@ -13,6 +13,15 @@
- 'publish-voltha-api-server-jobs':
branch-regexp: '{all-branches-regexp}'
+# -----------------------------------------------------------------------
+# verify-voltha-api-server-jobs
+# o explicitly dependent on v2.8
+# o copied to job verify-voltha-api-server-jobs-voltha-2.8
+# o updated verify-voltha-api-server-jobs to depend on v2.11
+# o is this another element that should be deleted with v2.11 ?
+# o if not deprecated rename job to contain *-voltha-x.y to be clear
+# the job is not intended for master branch.
+# -----------------------------------------------------------------------
- job-group:
name: 'verify-voltha-api-server-jobs'
jobs:
@@ -26,6 +35,21 @@
unit-test-keep-going: 'true'
junit-allow-empty-results: true
- 'voltha-patch-test':
+ pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+
+- job-group:
+ name: 'verify-voltha-api-server-jobs-voltha-2.8'
+ jobs:
+ - 'verify-licensed'
+ - 'tag-collision-reject':
+ dependency-jobs: 'verify_voltha-api-server_licensed'
+ - 'make-unit-test':
+ build-node: 'ubuntu18.04-basebuild-2c-4g'
+ dest-gopath: "github.com/opencord"
+ unit-test-targets: 'lint sca test'
+ unit-test-keep-going: 'true'
+ junit-allow-empty-results: true
+ - 'voltha-patch-test':
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
- job-group:
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index 5dad879..8f7dff6 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -8,6 +8,10 @@
jobs:
- 'verify-voltha-go-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-voltha-go-jobs-voltha-2.11':
+ name-extension: '-voltha-2.11'
+ override-branch: 'voltha-2.11'
+ branch-regexp: '^voltha-2.11$'
- 'verify-voltha-go-jobs-voltha-2.8':
name-extension: '-voltha-2.8'
override-branch: 'voltha-2.8'
@@ -39,6 +43,12 @@
unit-test-keep-going: 'true'
- job-group:
+ name: 'verify-voltha-go-jobs-voltha-2.11'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+
+- job-group:
name: 'verify-voltha-go-jobs-voltha-2.8'
jobs:
- 'voltha-patch-test':
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 82910d6..57c278a 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -8,6 +8,10 @@
jobs:
- 'verify-voltha-onos-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-voltha-onos-jobs-voltha-2.11':
+ name-extension: '-voltha-2.11'
+ override-branch: 'voltha-2.11'
+ branch-regexp: '^voltha-2.11$'
- 'verify-voltha-onos-jobs-voltha-2.8':
name-extension: '-voltha-2.8'
override-branch: 'voltha-2.8'
@@ -25,6 +29,12 @@
dependency-jobs: 'verify_voltha-onos_licensed'
- job-group:
+ name: 'verify-voltha-onos-jobs-voltha-2.11'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+
+- job-group:
name: 'verify-voltha-onos-jobs-voltha-2.8'
jobs:
- 'voltha-patch-test':
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index b45783c..9eb0ec1 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -8,6 +8,10 @@
jobs:
- 'verify-voltha-openonu-adapter-go-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.11':
+ name-extension: '-voltha-2.11'
+ override-branch: 'voltha-2.11'
+ branch-regexp: '^voltha-2.11$'
- 'verify-voltha-openonu-adapter-go-jobs-voltha-2.8':
name-extension: '-voltha-2.8'
override-branch: 'voltha-2.8'
@@ -38,6 +42,12 @@
build-node: 'ubuntu18.04-basebuild-2c-4g'
- job-group:
+ name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.11'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+
+- job-group:
name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.8'
jobs:
- 'voltha-patch-test':
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index 8b442db..064495a 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -9,6 +9,11 @@
- 'verify-voltha-system-tests-jobs':
build-node: 'ubuntu18.04-basebuild-4c-8g'
branch-regexp: '{all-branches-regexp}'
+ - 'verify-voltha-system-tests-jobs-voltha-2.11':
+ build-node: 'ubuntu18.04-basebuild-4c-8g'
+ name-extension: '-voltha-2.11'
+ override-branch: 'voltha-2.11'
+ branch-regexp: '^voltha-2.11$'
- 'verify-voltha-system-tests-jobs-voltha-2.8':
build-node: 'ubuntu18.04-basebuild-4c-8g'
name-extension: '-voltha-2.8'
@@ -30,6 +35,12 @@
junit-allow-empty-results: true
- job-group:
+ name: 'verify-voltha-system-tests-jobs-voltha-2.11'
+ jobs:
+ - 'voltha-patch-test':
+ pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
+
+- job-group:
name: 'verify-voltha-system-tests-jobs-voltha-2.8'
jobs:
- 'voltha-patch-test':