diff --git a/hack/update-zuul-jobs.py b/hack/update-zuul-jobs.py index 5ea5e79a..37ba2092 100755 --- a/hack/update-zuul-jobs.py +++ b/hack/update-zuul-jobs.py @@ -32,7 +32,8 @@ for image in images: files = [] if image != 'openstack-operator': files = ['^images/%s/.*' % image] - deps = ['opendev-buildset-registry'] + build_deps = ['openstack-operator:images:build:openstack-operator'] + upload_deps = ['openstack-operator:images:upload:openstack-operator'] job_vars = { 'docker_images': [ @@ -73,7 +74,6 @@ for image in images: 'name': 'openstack-operator:images:build:%s' % image, 'parent': 'vexxhost-build-docker-image', 'provides': 'openstack-operator:image:%s' % image, - 'dependencies': deps, 'vars': job_vars, } } @@ -83,11 +83,14 @@ for image in images: 'name': 'openstack-operator:images:upload:%s' % image, 'parent': 'vexxhost-upload-docker-image', 'provides': 'openstack-operator:image:%s' % image, - 'dependencies': deps, 'vars': job_vars, } } + if image != 'openstack-operator': + build_job['job']['dependencies'] = build_deps + upload_job['job']['dependencies'] = upload_deps + promote_job = { 'job': { 'name': 'openstack-operator:images:promote:%s' % image, diff --git a/tox.ini b/tox.ini index ff39b7e3..471937a5 100644 --- a/tox.ini +++ b/tox.ini @@ -13,6 +13,7 @@ commands = [testenv:update-zuul-jobs] deps = + dockerfile ruamel.yaml commands = {toxinidir}/hack/update-zuul-jobs.py diff --git a/zuul.d/ceilometer-jobs.yaml b/zuul.d/ceilometer-jobs.yaml index a14c3935..e4e897a4 100644 --- a/zuul.d/ceilometer-jobs.yaml +++ b/zuul.d/ceilometer-jobs.yaml @@ -2,27 +2,28 @@ name: openstack-operator:images:build:ceilometer parent: vexxhost-build-docker-image provides: openstack-operator:image:ceilometer - dependencies: &id001 - - opendev-buildset-registry - vars: &id002 + vars: &id001 docker_images: - context: images/ceilometer repository: vexxhost/ceilometer-agent-notification target: ceilometer-agent-notification - files: &id003 + dependencies: + - openstack-operator:images:build:openstack-operator + files: &id002 - ^images/ceilometer/.* - job: name: openstack-operator:images:upload:ceilometer parent: vexxhost-upload-docker-image provides: openstack-operator:image:ceilometer - dependencies: *id001 - vars: *id002 - files: *id003 + vars: *id001 + dependencies: + - openstack-operator:images:upload:openstack-operator + files: *id002 - job: name: openstack-operator:images:promote:ceilometer parent: vexxhost-promote-docker-image - vars: *id002 - files: *id003 + vars: *id001 + files: *id002 - project: check: jobs: diff --git a/zuul.d/functional-jobs.yaml b/zuul.d/functional-jobs.yaml index 975106c6..88e12675 100644 --- a/zuul.d/functional-jobs.yaml +++ b/zuul.d/functional-jobs.yaml @@ -16,7 +16,6 @@ - project: check: jobs: - - opendev-buildset-registry - openstack-operator:functional: dependencies: - name: openstack-operator:images:build:ceilometer @@ -34,7 +33,6 @@ soft: true gate: jobs: - - opendev-buildset-registry - openstack-operator:functional: dependencies: - name: openstack-operator:images:upload:ceilometer diff --git a/zuul.d/mcrouter-exporter-jobs.yaml b/zuul.d/mcrouter-exporter-jobs.yaml index 22e23a57..ca5ff2e7 100644 --- a/zuul.d/mcrouter-exporter-jobs.yaml +++ b/zuul.d/mcrouter-exporter-jobs.yaml @@ -2,26 +2,27 @@ name: openstack-operator:images:build:mcrouter-exporter parent: vexxhost-build-docker-image provides: openstack-operator:image:mcrouter-exporter - dependencies: &id001 - - opendev-buildset-registry - vars: &id002 + vars: &id001 docker_images: - context: images/mcrouter-exporter repository: vexxhost/mcrouter-exporter - files: &id003 + dependencies: + - openstack-operator:images:build:openstack-operator + files: &id002 - ^images/mcrouter-exporter/.* - job: name: openstack-operator:images:upload:mcrouter-exporter parent: vexxhost-upload-docker-image provides: openstack-operator:image:mcrouter-exporter - dependencies: *id001 - vars: *id002 - files: *id003 + vars: *id001 + dependencies: + - openstack-operator:images:upload:openstack-operator + files: *id002 - job: name: openstack-operator:images:promote:mcrouter-exporter parent: vexxhost-promote-docker-image - vars: *id002 - files: *id003 + vars: *id001 + files: *id002 - project: check: jobs: diff --git a/zuul.d/mcrouter-jobs.yaml b/zuul.d/mcrouter-jobs.yaml index ba05df97..18601986 100644 --- a/zuul.d/mcrouter-jobs.yaml +++ b/zuul.d/mcrouter-jobs.yaml @@ -2,26 +2,27 @@ name: openstack-operator:images:build:mcrouter parent: vexxhost-build-docker-image provides: openstack-operator:image:mcrouter - dependencies: &id001 - - opendev-buildset-registry - vars: &id002 + vars: &id001 docker_images: - context: images/mcrouter repository: vexxhost/mcrouter - files: &id003 + dependencies: + - openstack-operator:images:build:openstack-operator + files: &id002 - ^images/mcrouter/.* - job: name: openstack-operator:images:upload:mcrouter parent: vexxhost-upload-docker-image provides: openstack-operator:image:mcrouter - dependencies: *id001 - vars: *id002 - files: *id003 + vars: *id001 + dependencies: + - openstack-operator:images:upload:openstack-operator + files: *id002 - job: name: openstack-operator:images:promote:mcrouter parent: vexxhost-promote-docker-image - vars: *id002 - files: *id003 + vars: *id001 + files: *id002 - project: check: jobs: diff --git a/zuul.d/memcached-exporter-jobs.yaml b/zuul.d/memcached-exporter-jobs.yaml index bd6096b1..fbc8347b 100644 --- a/zuul.d/memcached-exporter-jobs.yaml +++ b/zuul.d/memcached-exporter-jobs.yaml @@ -2,26 +2,27 @@ name: openstack-operator:images:build:memcached-exporter parent: vexxhost-build-docker-image provides: openstack-operator:image:memcached-exporter - dependencies: &id001 - - opendev-buildset-registry - vars: &id002 + vars: &id001 docker_images: - context: images/memcached-exporter repository: vexxhost/memcached-exporter - files: &id003 + dependencies: + - openstack-operator:images:build:openstack-operator + files: &id002 - ^images/memcached-exporter/.* - job: name: openstack-operator:images:upload:memcached-exporter parent: vexxhost-upload-docker-image provides: openstack-operator:image:memcached-exporter - dependencies: *id001 - vars: *id002 - files: *id003 + vars: *id001 + dependencies: + - openstack-operator:images:upload:openstack-operator + files: *id002 - job: name: openstack-operator:images:promote:memcached-exporter parent: vexxhost-promote-docker-image - vars: *id002 - files: *id003 + vars: *id001 + files: *id002 - project: check: jobs: diff --git a/zuul.d/memcached-jobs.yaml b/zuul.d/memcached-jobs.yaml index 8849b082..e737b21e 100644 --- a/zuul.d/memcached-jobs.yaml +++ b/zuul.d/memcached-jobs.yaml @@ -2,26 +2,27 @@ name: openstack-operator:images:build:memcached parent: vexxhost-build-docker-image provides: openstack-operator:image:memcached - dependencies: &id001 - - opendev-buildset-registry - vars: &id002 + vars: &id001 docker_images: - context: images/memcached repository: vexxhost/memcached - files: &id003 + dependencies: + - openstack-operator:images:build:openstack-operator + files: &id002 - ^images/memcached/.* - job: name: openstack-operator:images:upload:memcached parent: vexxhost-upload-docker-image provides: openstack-operator:image:memcached - dependencies: *id001 - vars: *id002 - files: *id003 + vars: *id001 + dependencies: + - openstack-operator:images:upload:openstack-operator + files: *id002 - job: name: openstack-operator:images:promote:memcached parent: vexxhost-promote-docker-image - vars: *id002 - files: *id003 + vars: *id001 + files: *id002 - project: check: jobs: diff --git a/zuul.d/openstack-operator-jobs.yaml b/zuul.d/openstack-operator-jobs.yaml index bc5f1288..cb157621 100644 --- a/zuul.d/openstack-operator-jobs.yaml +++ b/zuul.d/openstack-operator-jobs.yaml @@ -2,9 +2,7 @@ name: openstack-operator:images:build:openstack-operator parent: vexxhost-build-docker-image provides: openstack-operator:image:openstack-operator - dependencies: &id001 - - opendev-buildset-registry - vars: &id002 + vars: &id001 docker_images: - context: . repository: vexxhost/openstack-operator @@ -13,12 +11,11 @@ name: openstack-operator:images:upload:openstack-operator parent: vexxhost-upload-docker-image provides: openstack-operator:image:openstack-operator - dependencies: *id001 - vars: *id002 + vars: *id001 - job: name: openstack-operator:images:promote:openstack-operator parent: vexxhost-promote-docker-image - vars: *id002 + vars: *id001 - project: check: jobs: diff --git a/zuul.d/rabbitmq-jobs.yaml b/zuul.d/rabbitmq-jobs.yaml index a118b3c5..7330147c 100644 --- a/zuul.d/rabbitmq-jobs.yaml +++ b/zuul.d/rabbitmq-jobs.yaml @@ -2,26 +2,27 @@ name: openstack-operator:images:build:rabbitmq parent: vexxhost-build-docker-image provides: openstack-operator:image:rabbitmq - dependencies: &id001 - - opendev-buildset-registry - vars: &id002 + vars: &id001 docker_images: - context: images/rabbitmq repository: vexxhost/rabbitmq - files: &id003 + dependencies: + - openstack-operator:images:build:openstack-operator + files: &id002 - ^images/rabbitmq/.* - job: name: openstack-operator:images:upload:rabbitmq parent: vexxhost-upload-docker-image provides: openstack-operator:image:rabbitmq - dependencies: *id001 - vars: *id002 - files: *id003 + vars: *id001 + dependencies: + - openstack-operator:images:upload:openstack-operator + files: *id002 - job: name: openstack-operator:images:promote:rabbitmq parent: vexxhost-promote-docker-image - vars: *id002 - files: *id003 + vars: *id001 + files: *id002 - project: check: jobs: