Change xos and services to use docker-publish instead of imagebuilder for Docker image creation
Change-Id: I4b001db4a38f74e89e371b7ca1bd27c9898798be
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index f7770bb..0d96475 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -71,7 +71,9 @@
seba-branches-regexp: '^(master|seba-1.0)$'
# for matching repos that build docker images with imagebuilder
- imagebuilder-projects-regexp: '^(xos.*|cord-tester|rcord|mcord|ecord|acordion|addressmanager|epc-service|exampleservice|fabric|fabric-crossconnect|globalxos|hippie-oss|hss_db|hypercache|internetemulator|monitoring|olt-service|onos-service|openstack|progran|sdn-controller|simpleexampleservice|templateservice|vEE|vEG|vBBU|venb|vHSS|vMME|vnaas|vPGWC|vPGWU|vrouter|vsg|vsg-hw|vSGW|vSM|vspgwc|vspgwu|vtn-service|vtr|att-workflow-driver|tt-workflow-driver)$'
+ # As of 2019-04-16 most of the services actively being developed use the
+ # make-based image generation process managed by the `docker-publish` job
+ imagebuilder-projects-regexp: '^(cord-tester|mcord|ecord|acordion|addressmanager|epc-service|exampleservice|globalxos|hippie-oss|hss_db|hypercache|internetemulator|monitoring|openstack|progran|sdn-controller|templateservice|vEE|vEG|vBBU|venb|vHSS|vMME|vnaas|vPGWC|vPGWU|vsg|vsg-hw|vSGW|vSM|vspgwc|vspgwu|vtn-service|vtr)$'
# strictness of version checks
semver-strict: 0
diff --git a/jjb/verify/att-workflow-driver.yaml b/jjb/verify/att-workflow-driver.yaml
index 0c915f2..4a75876 100644
--- a/jjb/verify/att-workflow-driver.yaml
+++ b/jjb/verify/att-workflow-driver.yaml
@@ -8,6 +8,7 @@
jobs:
- 'verify-att-workflow-driver-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'publish-att-workflow-driver-jobs'
- job-group:
name: 'verify-att-workflow-driver-jobs'
@@ -22,3 +23,10 @@
- 'api-test':
dependency-jobs: 'verify_att-workflow-driver_unit-test'
pipeline_script: 'all-xos-api-test-helm.groovy'
+
+- job-group:
+ name: 'publish-att-workflow-driver-jobs'
+ jobs:
+ - 'docker-publish':
+ docker-repo: 'xosproject'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/verify/fabric-crossconnect.yaml b/jjb/verify/fabric-crossconnect.yaml
index 17716dc..fab4042 100644
--- a/jjb/verify/fabric-crossconnect.yaml
+++ b/jjb/verify/fabric-crossconnect.yaml
@@ -8,6 +8,7 @@
jobs:
- 'verify-fabric-crossconnect-jobs':
branch-regexp: '{supported-branches-regexp}'
+ - 'publish-fabric-crossconnect-jobs'
- job-group:
name: 'verify-fabric-crossconnect-jobs'
@@ -22,3 +23,10 @@
- 'api-test':
dependency-jobs: 'verify_fabric-crossconnect_unit-test'
pipeline_script: 'all-xos-api-test-helm.groovy'
+
+- job-group:
+ name: 'publish-fabric-crossconnect-jobs'
+ jobs:
+ - 'docker-publish':
+ docker-repo: 'xosproject'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/verify/fabric.yaml b/jjb/verify/fabric.yaml
index 778ffe3..46a6ed0 100644
--- a/jjb/verify/fabric.yaml
+++ b/jjb/verify/fabric.yaml
@@ -8,6 +8,7 @@
jobs:
- 'verify-fabric-jobs':
branch-regexp: '{supported-branches-regexp}'
+ - 'publish-fabric-jobs'
- job-group:
name: 'verify-fabric-jobs'
@@ -22,3 +23,10 @@
- 'api-test':
dependency-jobs: 'verify_fabric_unit-test'
pipeline_script: 'all-xos-api-test-helm.groovy'
+
+- job-group:
+ name: 'publish-fabric-jobs'
+ jobs:
+ - 'docker-publish':
+ docker-repo: 'xosproject'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/verify/olt-service.yaml b/jjb/verify/olt-service.yaml
index b891963..3035803 100644
--- a/jjb/verify/olt-service.yaml
+++ b/jjb/verify/olt-service.yaml
@@ -8,6 +8,7 @@
jobs:
- 'verify-olt-service-jobs':
branch-regexp: '{supported-branches-regexp}'
+ - 'publish-olt-service-jobs'
- job-group:
name: 'verify-olt-service-jobs'
@@ -22,3 +23,10 @@
- 'api-test':
dependency-jobs: 'verify_olt-service_unit-test'
pipeline_script: 'all-xos-api-test-helm.groovy'
+
+- job-group:
+ name: 'publish-olt-service-jobs'
+ jobs:
+ - 'docker-publish':
+ docker-repo: 'xosproject'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/verify/onos-service.yaml b/jjb/verify/onos-service.yaml
index da64670..f61b384 100644
--- a/jjb/verify/onos-service.yaml
+++ b/jjb/verify/onos-service.yaml
@@ -8,6 +8,7 @@
jobs:
- 'verify-onos-service-jobs':
branch-regexp: '{supported-branches-regexp}'
+ - 'publish-onos-service-jobs'
- job-group:
name: 'verify-onos-service-jobs'
@@ -22,3 +23,10 @@
- 'api-test':
dependency-jobs: 'verify_onos-service_unit-test'
pipeline_script: 'all-xos-api-test-helm.groovy'
+
+- job-group:
+ name: 'publish-onos-service-jobs'
+ jobs:
+ - 'docker-publish':
+ docker-repo: 'xosproject'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/verify/rcord.yaml b/jjb/verify/rcord.yaml
index 1472f7e..b2d6484 100644
--- a/jjb/verify/rcord.yaml
+++ b/jjb/verify/rcord.yaml
@@ -8,6 +8,7 @@
jobs:
- 'verify-rcord-jobs':
branch-regexp: '{supported-branches-regexp}'
+ - 'publish-rcord-jobs'
- job-group:
name: 'verify-rcord-jobs'
@@ -22,3 +23,10 @@
- 'api-test':
dependency-jobs: 'verify_rcord_unit-test'
pipeline_script: 'all-xos-api-test-helm.groovy'
+
+- job-group:
+ name: 'publish-rcord-jobs'
+ jobs:
+ - 'docker-publish':
+ docker-repo: 'xosproject'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/verify/simpleexampleservice.yaml b/jjb/verify/simpleexampleservice.yaml
index 7f93703..95ba4d3 100644
--- a/jjb/verify/simpleexampleservice.yaml
+++ b/jjb/verify/simpleexampleservice.yaml
@@ -8,6 +8,7 @@
jobs:
- 'verify-simpleexampleservice-jobs':
branch-regexp: '{supported-branches-regexp}'
+ - 'publish-simpleexampleservice-jobs'
- job-group:
name: 'verify-simpleexampleservice-jobs'
@@ -22,3 +23,10 @@
- 'api-test':
dependency-jobs: 'verify_simpleexampleservice_unit-test'
pipeline_script: 'all-xos-api-test-helm.groovy'
+
+- job-group:
+ name: 'publish-simpleexampleservice-jobs'
+ jobs:
+ - 'docker-publish':
+ docker-repo: 'xosproject'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/verify/tt-workflow-driver.yaml b/jjb/verify/tt-workflow-driver.yaml
index 6a0b070..e913d62 100644
--- a/jjb/verify/tt-workflow-driver.yaml
+++ b/jjb/verify/tt-workflow-driver.yaml
@@ -8,6 +8,7 @@
jobs:
- 'verify-tt-workflow-driver-jobs':
branch-regexp: '{all-branches-regexp}'
+ - 'publish-tt-workflow-driver-jobs'
- job-group:
name: 'verify-tt-workflow-driver-jobs'
@@ -23,3 +24,10 @@
# - 'api-test':
# dependency-jobs: 'verify_tt-workflow-driver_unit-test'
# pipeline_script: 'all-xos-api-test-helm.groovy'
+
+- job-group:
+ name: 'publish-tt-workflow-driver-jobs'
+ jobs:
+ - 'docker-publish':
+ docker-repo: 'xosproject'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/verify/vrouter.yaml b/jjb/verify/vrouter.yaml
index d801e06..0217beb 100644
--- a/jjb/verify/vrouter.yaml
+++ b/jjb/verify/vrouter.yaml
@@ -8,6 +8,7 @@
jobs:
- 'verify-vrouter-jobs':
branch-regexp: '{supported-branches-regexp}'
+ - 'publish-vrouter-jobs'
- job-group:
name: 'verify-vrouter-jobs'
@@ -22,3 +23,10 @@
- 'api-test':
dependency-jobs: 'verify_vrouter_unit-test'
pipeline_script: 'all-xos-api-test-helm.groovy'
+
+- job-group:
+ name: 'publish-vrouter-jobs'
+ jobs:
+ - 'docker-publish':
+ docker-repo: 'xosproject'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/verify/xos-gui.yaml b/jjb/verify/xos-gui.yaml
index e88b61d..facb429 100644
--- a/jjb/verify/xos-gui.yaml
+++ b/jjb/verify/xos-gui.yaml
@@ -8,6 +8,7 @@
jobs:
- 'verify-xos-gui-jobs':
branch-regexp: '{supported-branches-regexp}'
+ - 'publish-xos-gui-jobs'
- job-group:
name: 'verify-xos-gui-jobs'
@@ -19,3 +20,10 @@
dependency-jobs: 'verify_xos-gui_tag-collision'
- 'gui-unit-test':
dependency-jobs: 'verify_xos-gui_sonarqube'
+
+- job-group:
+ name: 'publish-xos-gui-jobs'
+ jobs:
+ - 'docker-publish':
+ docker-repo: 'xosproject'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/verify/xos-rest-gw.yaml b/jjb/verify/xos-rest-gw.yaml
index 0eb70a4..892dbc5 100644
--- a/jjb/verify/xos-rest-gw.yaml
+++ b/jjb/verify/xos-rest-gw.yaml
@@ -8,6 +8,7 @@
jobs:
- 'verify-xos-rest-gw-jobs':
branch-regexp: '{supported-branches-regexp}'
+ - 'publish-xos-rest-gw-jobs'
- job-group:
name: 'verify-xos-rest-gw-jobs'
@@ -19,3 +20,10 @@
dependency-jobs: 'verify_xos-rest-gw_tag-collision'
- 'xos-rest-gw-unit':
dependency-jobs: 'verify_xos-rest-gw_sonarqube'
+
+- job-group:
+ name: 'publish-xos-rest-gw-jobs'
+ jobs:
+ - 'docker-publish':
+ docker-repo: 'xosproject'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/verify/xos-tosca.yaml b/jjb/verify/xos-tosca.yaml
index bdcca9f..9ad3bf0 100644
--- a/jjb/verify/xos-tosca.yaml
+++ b/jjb/verify/xos-tosca.yaml
@@ -8,6 +8,7 @@
jobs:
- 'verify-xos-tosca-jobs':
branch-regexp: '{supported-branches-regexp}'
+ - 'publish-xos-tosca-jobs'
- job-group:
name: 'verify-xos-tosca-jobs'
@@ -20,3 +21,10 @@
- 'api-test':
pipeline_script: 'all-xos-api-test-helm.groovy'
dependency-jobs: 'verify_xos-tosca_unit-test'
+
+- job-group:
+ name: 'publish-xos-tosca-jobs'
+ jobs:
+ - 'docker-publish':
+ docker-repo: 'xosproject'
+ dependency-jobs: 'version-tag'
diff --git a/jjb/verify/xos.yaml b/jjb/verify/xos.yaml
index d1aa840..05f18d5 100644
--- a/jjb/verify/xos.yaml
+++ b/jjb/verify/xos.yaml
@@ -10,7 +10,7 @@
branch-regexp: '{supported-branches-regexp}'
- 'verify-xos-jobs-code':
branch-regexp: '{supported-branches-regexp}'
- - 'post-merge-publish-xos':
+ - 'publish-xos-jobs':
branch-regexp: '{supported-branches-regexp}'
# these two job groups are split so that documentation-only patches can go into
@@ -36,10 +36,13 @@
pipeline_script: 'xos-core.groovy'
- job-group:
- name: 'post-merge-publish-xos'
+ name: 'publish-xos-jobs'
jobs:
- 'pypi-publish':
pypi-module-dirs: 'lib/xos-config|lib/xos-genx|lib/xos-util|lib/xos-api|lib/xos-migrate|lib/xos-synchronizer|lib/xos-kafka'
project-regexp: '^{name}$'
pypi-index: 'pypi'
dependency-jobs: 'version-tag'
+ - 'docker-publish':
+ docker-repo: 'xosproject'
+ dependency-jobs: 'version-tag'