JJB cleanups for VOLTHA.
Misc/
o yaml lint clenaups
o Remove prototype voltha-2.{9,10,11} job placeholders.
o Replace mainatiner email address (Matteo) with build system group.
Change-Id: I37e1175f56042632753b75c849dbaf07f74bd284
diff --git a/jjb/verify/att-workflow-driver.yaml b/jjb/verify/att-workflow-driver.yaml
index 91b0514..f244a66 100644
--- a/jjb/verify/att-workflow-driver.yaml
+++ b/jjb/verify/att-workflow-driver.yaml
@@ -25,6 +25,6 @@
name: 'publish-att-workflow-driver-jobs'
jobs:
- 'docker-publish':
- maintainers: "teo@opennetworking.org, andy@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org, andy@opennetworking.org"
docker-repo: 'xosproject'
dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/bbsim-sadis-server.yaml b/jjb/verify/bbsim-sadis-server.yaml
index e603bc8..be04f9f 100644
--- a/jjb/verify/bbsim-sadis-server.yaml
+++ b/jjb/verify/bbsim-sadis-server.yaml
@@ -11,9 +11,6 @@
- 'verify-bbsim-sadis-server-jobs-voltha-2.8':
name-extension: '-voltha-2.8'
branch-regexp: '^voltha-2.8$'
- - 'verify-bbsim-sadis-server-jobs-voltha-2.9':
- name-extension: '-voltha-2.9'
- branch-regexp: '^voltha-2.9$'
- 'verify-bbsim-sadis-server-jobs-master':
branch-regexp: '^master$'
- 'publish-bbsim-sadis-server-jobs':
@@ -38,12 +35,6 @@
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
- job-group:
- name: 'verify-bbsim-sadis-server-jobs-voltha-2.9'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
name: 'verify-bbsim-sadis-server-jobs-master'
jobs:
- 'voltha-patch-test':
@@ -53,6 +44,6 @@
name: 'publish-bbsim-sadis-server-jobs'
jobs:
- 'docker-publish':
- maintainers: "teo@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org"
docker-repo: 'voltha'
dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/bbsim.yaml b/jjb/verify/bbsim.yaml
index f156b67..185b399 100644
--- a/jjb/verify/bbsim.yaml
+++ b/jjb/verify/bbsim.yaml
@@ -12,14 +12,6 @@
name-extension: '-voltha-2.8'
override-branch: 'voltha-2.8'
branch-regexp: '^voltha-2.8$'
- - 'verify-bbsim-jobs-voltha-2.10':
- name-extension: '-voltha-2.10'
- override-branch: 'voltha-2.10'
- branch-regexp: '^voltha-2.10$'
- - 'verify-bbsim-jobs-voltha-2.11':
- name-extension: '-voltha-2.11'
- override-branch: 'voltha-2.11'
- branch-regexp: '^voltha-2.11$'
- 'verify-bbsim-jobs-master':
branch-regexp: '^master$'
- 'publish-bbsim-jobs':
@@ -60,72 +52,6 @@
logging: true
- job-group:
- name: 'verify-bbsim-jobs-voltha-2.9'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
- testTargets: |
- - target: sanity-bbsim-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: sanity-bbsim-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: sanity-bbsim-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
-
-- job-group:
- name: 'verify-bbsim-jobs-voltha-2.10'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.10/bbsim-tests.groovy'
- testTargets: |
- - target: sanity-bbsim-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: sanity-bbsim-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: sanity-bbsim-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
-
-- job-group:
- name: 'verify-bbsim-jobs-voltha-2.11'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.11/bbsim-tests.groovy'
- testTargets: |
- - target: sanity-bbsim-att
- workflow: att
- flags: ""
- teardown: true
- logging: true
- - target: sanity-bbsim-dt
- workflow: dt
- flags: ""
- teardown: true
- logging: true
- - target: sanity-bbsim-tt
- workflow: tt
- flags: ""
- teardown: true
- logging: true
-
-- job-group:
name: 'verify-bbsim-jobs-master'
jobs:
- 'voltha-patch-test':
@@ -151,11 +77,11 @@
name: 'publish-bbsim-jobs'
jobs:
- 'docker-publish':
- maintainers: "teo@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org"
docker-repo: 'voltha'
dependency-jobs: 'version-tag_wildcard'
- 'github-release':
- dependency-jobs: 'version-tag_wildcard'
- github-organization: 'opencord'
- release-targets: 'release'
- artifact-glob: 'release/*'
+ dependency-jobs: 'version-tag_wildcard'
+ github-organization: 'opencord'
+ release-targets: 'release'
+ artifact-glob: 'release/*'
diff --git a/jjb/verify/device-management-interface.yaml b/jjb/verify/device-management-interface.yaml
index 45828df..63861c8 100644
--- a/jjb/verify/device-management-interface.yaml
+++ b/jjb/verify/device-management-interface.yaml
@@ -22,8 +22,8 @@
junit-allow-empty-results: true
- job-group:
- name: 'post-merge-device-management-interface-jobs'
- jobs:
- - 'pypi-publish':
- project-regexp: '^{name}$'
- dependency-jobs: 'version-tag_wildcard'
+ name: 'post-merge-device-management-interface-jobs'
+ jobs:
+ - 'pypi-publish':
+ project-regexp: '^{name}$'
+ dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/fabric-crossconnect.yaml b/jjb/verify/fabric-crossconnect.yaml
index 72825a4..fcdf313 100644
--- a/jjb/verify/fabric-crossconnect.yaml
+++ b/jjb/verify/fabric-crossconnect.yaml
@@ -24,6 +24,6 @@
name: 'publish-fabric-crossconnect-jobs'
jobs:
- 'docker-publish':
- maintainers: "teo@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org"
docker-repo: 'xosproject'
dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/fabric.yaml b/jjb/verify/fabric.yaml
index a43e56a..3c6954e 100644
--- a/jjb/verify/fabric.yaml
+++ b/jjb/verify/fabric.yaml
@@ -25,6 +25,6 @@
name: 'publish-fabric-jobs'
jobs:
- 'docker-publish':
- maintainers: "teo@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org"
docker-repo: 'xosproject'
dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/ofagent-go.yaml b/jjb/verify/ofagent-go.yaml
index fbd511c..4e37059 100644
--- a/jjb/verify/ofagent-go.yaml
+++ b/jjb/verify/ofagent-go.yaml
@@ -12,10 +12,6 @@
name-extension: '-voltha-2.8'
override-branch: 'voltha-2.8'
branch-regexp: '{kind-voltha-regexp}'
- - 'verify-ofagent-jobs-voltha-2.9':
- name-extension: '-voltha-2.9'
- override-branch: 'voltha-2.9'
- branch-regexp: '{kind-voltha-regexp}'
- 'verify-ofagent-jobs-master':
branch-regexp: '^master$'
- 'publish-ofagent-go-jobs':
@@ -41,12 +37,6 @@
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
- job-group:
- name: 'verify-ofagent-jobs-voltha-2.9'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
name: 'verify-ofagent-jobs-master'
jobs:
- 'voltha-patch-test':
diff --git a/jjb/verify/olt-service.yaml b/jjb/verify/olt-service.yaml
index b20963c..cc0940b 100644
--- a/jjb/verify/olt-service.yaml
+++ b/jjb/verify/olt-service.yaml
@@ -24,6 +24,6 @@
name: 'publish-olt-service-jobs'
jobs:
- 'docker-publish':
- maintainers: "teo@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org"
docker-repo: 'xosproject'
dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/opendevice-manager.yaml b/jjb/verify/opendevice-manager.yaml
index 108ff79..144efe7 100644
--- a/jjb/verify/opendevice-manager.yaml
+++ b/jjb/verify/opendevice-manager.yaml
@@ -30,5 +30,3 @@
build-timeout: 30
docker-repo: 'voltha'
dependency-jobs: 'version-tag_wildcard'
-
-
diff --git a/jjb/verify/rcord.yaml b/jjb/verify/rcord.yaml
index beee28a..6dc0b1c 100644
--- a/jjb/verify/rcord.yaml
+++ b/jjb/verify/rcord.yaml
@@ -25,6 +25,6 @@
name: 'publish-rcord-jobs'
jobs:
- 'docker-publish':
- maintainers: "teo@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org"
docker-repo: 'xosproject'
dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/tt-workflow-driver.yaml b/jjb/verify/tt-workflow-driver.yaml
index 2e76b9f..78b5ec8 100644
--- a/jjb/verify/tt-workflow-driver.yaml
+++ b/jjb/verify/tt-workflow-driver.yaml
@@ -23,6 +23,6 @@
name: 'publish-tt-workflow-driver-jobs'
jobs:
- 'docker-publish':
- maintainers: "teo@opennetworking.org, andy@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org, andy@opennetworking.org"
docker-repo: 'xosproject'
dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/up4.yaml b/jjb/verify/up4.yaml
index edc08b7..5ec1bf5 100644
--- a/jjb/verify/up4.yaml
+++ b/jjb/verify/up4.yaml
@@ -11,8 +11,8 @@
# Matrix
up4Ctrl:
- - pfcp
- - p4rt
+ - pfcp
+ - p4rt
jobs:
- "up4-jobs":
diff --git a/jjb/verify/voltha-go-controller.yaml b/jjb/verify/voltha-go-controller.yaml
index 7f47410..a74ae14 100644
--- a/jjb/verify/voltha-go-controller.yaml
+++ b/jjb/verify/voltha-go-controller.yaml
@@ -8,16 +8,6 @@
jobs:
- 'verify-voltha-go-controller-jobs':
branch-regexp: '{all-branches-regexp}'
- # NOTE no releases yet, will be enabled once 2.10 or 2.11 is out
- # - 'verify-voltha-go-controller-jobs-voltha-2.9':
- # name-extension: '-voltha-2.9'
- # branch-regexp: '^voltha-2.9$'
- # NOTE will be enabled once we have a pipeline that supports this controller
- # - 'verify-voltha-go-controller-jobs-master':
- # branch-regexp: '^master$'
- # NOTE will be enabled once we have artifacts to build
- # - 'publish-voltha-go-controller-jobs':
- # branch-regexp: '{all-branches-regexp}'
- job-group:
name: 'verify-voltha-go-controller-jobs'
diff --git a/jjb/verify/voltha-go.yaml b/jjb/verify/voltha-go.yaml
index d685ce6..5dad879 100644
--- a/jjb/verify/voltha-go.yaml
+++ b/jjb/verify/voltha-go.yaml
@@ -12,10 +12,6 @@
name-extension: '-voltha-2.8'
override-branch: 'voltha-2.8'
branch-regexp: '^voltha-2.8$'
- - 'verify-voltha-go-jobs-voltha-2.9':
- name-extension: '-voltha-2.9'
- override-branch: 'voltha-2.9'
- branch-regexp: '^voltha-2.9$'
- 'verify-voltha-go-jobs-master':
branch-regexp: '^master$'
- 'publish-voltha-go-jobs':
@@ -49,12 +45,6 @@
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
- job-group:
- name: 'verify-voltha-go-jobs-voltha-2.9'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
name: 'verify-voltha-go-jobs-master'
jobs:
- 'voltha-patch-test':
diff --git a/jjb/verify/voltha-northbound-bbf-adapter.yaml b/jjb/verify/voltha-northbound-bbf-adapter.yaml
index 10ab460..0e01384 100644
--- a/jjb/verify/voltha-northbound-bbf-adapter.yaml
+++ b/jjb/verify/voltha-northbound-bbf-adapter.yaml
@@ -52,6 +52,6 @@
name: 'publish-voltha-northbound-bbf-adapter-jobs'
jobs:
- 'docker-publish':
- maintainers: "teo@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org"
docker-repo: 'voltha'
dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/voltha-onos.yaml b/jjb/verify/voltha-onos.yaml
index 6b17787..82910d6 100644
--- a/jjb/verify/voltha-onos.yaml
+++ b/jjb/verify/voltha-onos.yaml
@@ -12,10 +12,6 @@
name-extension: '-voltha-2.8'
override-branch: 'voltha-2.8'
branch-regexp: '^voltha-2.8$'
- - 'verify-voltha-onos-jobs-voltha-2.9':
- name-extension: '-voltha-2.9'
- override-branch: 'voltha-2.9'
- branch-regexp: '^voltha-2.9$'
- 'verify-voltha-onos-jobs-master':
branch-regexp: '^master$'
- 'publish-voltha-onos-jobs':
@@ -35,12 +31,6 @@
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
- job-group:
- name: 'verify-voltha-onos-jobs-voltha-2.9'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
name: 'verify-voltha-onos-jobs-master'
jobs:
- 'voltha-patch-test':
diff --git a/jjb/verify/voltha-openolt-adapter.yaml b/jjb/verify/voltha-openolt-adapter.yaml
index 9c9f878..b93d35c 100644
--- a/jjb/verify/voltha-openolt-adapter.yaml
+++ b/jjb/verify/voltha-openolt-adapter.yaml
@@ -12,10 +12,6 @@
name-extension: '-voltha-2.8'
override-branch: 'voltha-2.8'
branch-regexp: '^voltha-2.8$'
- - 'verify-voltha-openolt-adapter-jobs-voltha-2.9':
- name-extension: '-voltha-2.9'
- override-branch: 'voltha-2.9'
- branch-regexp: '^voltha-2.9$'
- 'verify-voltha-openolt-adapter-jobs-master':
branch-regexp: '^master$'
- 'publish-voltha-openolt-adapter-jobs':
@@ -49,12 +45,6 @@
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
- job-group:
- name: 'verify-voltha-openolt-adapter-jobs-voltha-2.9'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
name: 'verify-voltha-openolt-adapter-jobs-master'
jobs:
- 'voltha-patch-test':
diff --git a/jjb/verify/voltha-openonu-adapter-go.yaml b/jjb/verify/voltha-openonu-adapter-go.yaml
index 5bd6e85..b45783c 100644
--- a/jjb/verify/voltha-openonu-adapter-go.yaml
+++ b/jjb/verify/voltha-openonu-adapter-go.yaml
@@ -12,10 +12,6 @@
name-extension: '-voltha-2.8'
override-branch: 'voltha-2.8'
branch-regexp: '^voltha-2.8$'
- - 'verify-voltha-openonu-adapter-go-jobs-voltha-2.9':
- name-extension: '-voltha-2.9'
- override-branch: 'voltha-2.9'
- branch-regexp: '^voltha-2.9$'
- 'verify-voltha-openonu-adapter-go-jobs-master':
branch-regexp: '^master$'
- 'publish-voltha-openonu-adapter-go-jobs':
@@ -48,12 +44,6 @@
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
- job-group:
- name: 'verify-voltha-openonu-adapter-go-jobs-voltha-2.9'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
name: 'verify-voltha-openonu-adapter-go-jobs-master'
jobs:
- 'voltha-patch-test':
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index 9a8cc35..8b442db 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -10,22 +10,12 @@
build-node: 'ubuntu18.04-basebuild-4c-8g'
branch-regexp: '{all-branches-regexp}'
- 'verify-voltha-system-tests-jobs-voltha-2.8':
- build-node: 'ubuntu18.04-basebuild-4c-8g'
+ build-node: 'ubuntu18.04-basebuild-4c-8g'
name-extension: '-voltha-2.8'
override-branch: 'voltha-2.8'
branch-regexp: '^voltha-2.8$'
- - 'verify-voltha-system-tests-jobs-voltha-2.9':
- build-node: 'ubuntu18.04-basebuild-4c-8g'
- name-extension: '-voltha-2.9'
- override-branch: 'voltha-2.9'
- branch-regexp: '^voltha-2.9$'
- - 'verify-voltha-system-tests-jobs-voltha-2.10':
- build-node: 'ubuntu18.04-basebuild-4c-8g'
- name-extension: '-voltha-2.10'
- override-branch: 'voltha-2.10'
- branch-regexp: '^voltha-2.10$'
- 'verify-voltha-system-tests-jobs-master':
- build-node: 'ubuntu18.04-basebuild-4c-8g'
+ build-node: 'ubuntu18.04-basebuild-4c-8g'
branch-regexp: '^master$'
- job-group:
@@ -46,18 +36,6 @@
pipeline-script: 'voltha/voltha-2.8/bbsim-tests.groovy'
- job-group:
- name: 'verify-voltha-system-tests-jobs-voltha-2.9'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.9/bbsim-tests.groovy'
-
-- job-group:
- name: 'verify-voltha-system-tests-jobs-voltha-2.10'
- jobs:
- - 'voltha-patch-test':
- pipeline-script: 'voltha/voltha-2.10/bbsim-tests.groovy'
-
-- job-group:
name: 'verify-voltha-system-tests-jobs-master'
jobs:
- 'voltha-patch-test':
diff --git a/jjb/verify/vrouter.yaml b/jjb/verify/vrouter.yaml
index e77d87a..2abd236 100644
--- a/jjb/verify/vrouter.yaml
+++ b/jjb/verify/vrouter.yaml
@@ -23,6 +23,6 @@
name: 'publish-vrouter-jobs'
jobs:
- 'docker-publish':
- maintainers: "teo@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org"
docker-repo: 'xosproject'
dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/xos-gui.yaml b/jjb/verify/xos-gui.yaml
index 1e7188c..862b2b7 100644
--- a/jjb/verify/xos-gui.yaml
+++ b/jjb/verify/xos-gui.yaml
@@ -23,6 +23,6 @@
name: 'publish-xos-gui-jobs'
jobs:
- 'docker-publish':
- maintainers: "teo@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org"
docker-repo: 'xosproject'
dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/xos-rest-gw.yaml b/jjb/verify/xos-rest-gw.yaml
index 5f1e29f..db0d56c 100644
--- a/jjb/verify/xos-rest-gw.yaml
+++ b/jjb/verify/xos-rest-gw.yaml
@@ -23,6 +23,6 @@
name: 'publish-xos-rest-gw-jobs'
jobs:
- 'docker-publish':
- maintainers: "teo@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org"
docker-repo: 'xosproject'
dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/xos-tosca.yaml b/jjb/verify/xos-tosca.yaml
index d4bd8a2..2f65d5c 100644
--- a/jjb/verify/xos-tosca.yaml
+++ b/jjb/verify/xos-tosca.yaml
@@ -23,6 +23,6 @@
name: 'publish-xos-tosca-jobs'
jobs:
- 'docker-publish':
- maintainers: "teo@opennetworking.org, scottb@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org, scottb@opennetworking.org"
docker-repo: 'xosproject'
dependency-jobs: 'version-tag_wildcard'
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
index 889eae7..afc6ee1 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -44,7 +44,7 @@
pypi-index: 'pypi'
dependency-jobs: 'version-tag_wildcard'
- 'docker-publish':
- maintainers: "teo@opennetworking.org, andy@opennetworking.org, scottb@opennetworking.org"
+ maintainers: "onf-bat-admin@opennetworking.org, andy@opennetworking.org, scottb@opennetworking.org"
build-timeout: 30
docker-repo: 'xosproject'
dependency-jobs: 'version-tag_wildcard'