vexxhost
/
openstack-operator
Code Issues Proposed changes

stop using opendev registry 

We pretty much always need to build the image for the operator so we
should just instead use that as our buildset registry too.

Change-Id: I5c60f6261df9697bd589e796521c613cff5af8f1
This commit is contained in:
Mohammed Naser 2020-04-26 11:23:05 -04:00
parent 555fabc0bf
commit f354f48ef0
10 changed files with 70 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hack/update-zuul-jobs.py
View File

@ -32,7 +32,8 @@ for image in images:
files = [] files = []
if image != 'openstack-operator': if image != 'openstack-operator':
files = ['^images/%s/.*' % image] 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 = { job_vars = {
'docker_images': [ 'docker_images': [
@ -73,7 +74,6 @@ for image in images:
'name': 'openstack-operator:images:build:%s' % image, 'name': 'openstack-operator:images:build:%s' % image,
'parent': 'vexxhost-build-docker-image', 'parent': 'vexxhost-build-docker-image',
'provides': 'openstack-operator:image:%s' % image, 'provides': 'openstack-operator:image:%s' % image,
'dependencies': deps,
'vars': job_vars, 'vars': job_vars,
} }
} }
@ -83,11 +83,14 @@ for image in images:
'name': 'openstack-operator:images:upload:%s' % image, 'name': 'openstack-operator:images:upload:%s' % image,
'parent': 'vexxhost-upload-docker-image', 'parent': 'vexxhost-upload-docker-image',
'provides': 'openstack-operator:image:%s' % image, 'provides': 'openstack-operator:image:%s' % image,
'dependencies': deps,
'vars': job_vars, 'vars': job_vars,
} }
} }
if image != 'openstack-operator':
build_job['job']['dependencies'] = build_deps
upload_job['job']['dependencies'] = upload_deps
promote_job = { promote_job = {
'job': { 'job': {
'name': 'openstack-operator:images:promote:%s' % image, 'name': 'openstack-operator:images:promote:%s' % image,

1
tox.ini
View File

@ -13,6 +13,7 @@ commands =
[testenv:update-zuul-jobs] [testenv:update-zuul-jobs]
deps = deps =
dockerfile
ruamel.yaml ruamel.yaml
commands = commands =
{toxinidir}/hack/update-zuul-jobs.py {toxinidir}/hack/update-zuul-jobs.py

19
zuul.d/ceilometer-jobs.yaml
View File

@ -2,27 +2,28 @@
name: openstack-operator:images:build:ceilometer name: openstack-operator:images:build:ceilometer
parent: vexxhost-build-docker-image parent: vexxhost-build-docker-image
provides: openstack-operator:image:ceilometer provides: openstack-operator:image:ceilometer
dependencies: &id001 vars: &id001
- opendev-buildset-registry
vars: &id002
docker_images: docker_images:
- context: images/ceilometer - context: images/ceilometer
repository: vexxhost/ceilometer-agent-notification repository: vexxhost/ceilometer-agent-notification
target: ceilometer-agent-notification target: ceilometer-agent-notification
files: &id003 dependencies:
- openstack-operator:images:build:openstack-operator
files: &id002
- ^images/ceilometer/.* - ^images/ceilometer/.*
- job: - job:
name: openstack-operator:images:upload:ceilometer name: openstack-operator:images:upload:ceilometer
parent: vexxhost-upload-docker-image parent: vexxhost-upload-docker-image
provides: openstack-operator:image:ceilometer provides: openstack-operator:image:ceilometer
dependencies: *id001 vars: *id001
vars: *id002 dependencies:
files: *id003 - openstack-operator:images:upload:openstack-operator
files: *id002
- job: - job:
name: openstack-operator:images:promote:ceilometer name: openstack-operator:images:promote:ceilometer
parent: vexxhost-promote-docker-image parent: vexxhost-promote-docker-image
vars: *id002 vars: *id001
files: *id003 files: *id002
- project: - project:
check: check:
jobs: jobs:

2
zuul.d/functional-jobs.yaml
View File

@ -16,7 +16,6 @@
- project: - project:
check: check:
jobs: jobs:
- opendev-buildset-registry
- openstack-operator:functional: - openstack-operator:functional:
dependencies: dependencies:
- name: openstack-operator:images:build:ceilometer - name: openstack-operator:images:build:ceilometer
@ -34,7 +33,6 @@
soft: true soft: true
gate: gate:
jobs: jobs:
- opendev-buildset-registry
- openstack-operator:functional: - openstack-operator:functional:
dependencies: dependencies:
- name: openstack-operator:images:upload:ceilometer - name: openstack-operator:images:upload:ceilometer

19
zuul.d/mcrouter-exporter-jobs.yaml
View File

@ -2,26 +2,27 @@
name: openstack-operator:images:build:mcrouter-exporter name: openstack-operator:images:build:mcrouter-exporter
parent: vexxhost-build-docker-image parent: vexxhost-build-docker-image
provides: openstack-operator:image:mcrouter-exporter provides: openstack-operator:image:mcrouter-exporter
dependencies: &id001 vars: &id001
- opendev-buildset-registry
vars: &id002
docker_images: docker_images:
- context: images/mcrouter-exporter - context: images/mcrouter-exporter
repository: vexxhost/mcrouter-exporter repository: vexxhost/mcrouter-exporter
files: &id003 dependencies:
- openstack-operator:images:build:openstack-operator
files: &id002
- ^images/mcrouter-exporter/.* - ^images/mcrouter-exporter/.*
- job: - job:
name: openstack-operator:images:upload:mcrouter-exporter name: openstack-operator:images:upload:mcrouter-exporter
parent: vexxhost-upload-docker-image parent: vexxhost-upload-docker-image
provides: openstack-operator:image:mcrouter-exporter provides: openstack-operator:image:mcrouter-exporter
dependencies: *id001 vars: *id001
vars: *id002 dependencies:
files: *id003 - openstack-operator:images:upload:openstack-operator
files: *id002
- job: - job:
name: openstack-operator:images:promote:mcrouter-exporter name: openstack-operator:images:promote:mcrouter-exporter
parent: vexxhost-promote-docker-image parent: vexxhost-promote-docker-image
vars: *id002 vars: *id001
files: *id003 files: *id002
- project: - project:
check: check:
jobs: jobs:

19
zuul.d/mcrouter-jobs.yaml
View File

@ -2,26 +2,27 @@
name: openstack-operator:images:build:mcrouter name: openstack-operator:images:build:mcrouter
parent: vexxhost-build-docker-image parent: vexxhost-build-docker-image
provides: openstack-operator:image:mcrouter provides: openstack-operator:image:mcrouter
dependencies: &id001 vars: &id001
- opendev-buildset-registry
vars: &id002
docker_images: docker_images:
- context: images/mcrouter - context: images/mcrouter
repository: vexxhost/mcrouter repository: vexxhost/mcrouter
files: &id003 dependencies:
- openstack-operator:images:build:openstack-operator
files: &id002
- ^images/mcrouter/.* - ^images/mcrouter/.*
- job: - job:
name: openstack-operator:images:upload:mcrouter name: openstack-operator:images:upload:mcrouter
parent: vexxhost-upload-docker-image parent: vexxhost-upload-docker-image
provides: openstack-operator:image:mcrouter provides: openstack-operator:image:mcrouter
dependencies: *id001 vars: *id001
vars: *id002 dependencies:
files: *id003 - openstack-operator:images:upload:openstack-operator
files: *id002
- job: - job:
name: openstack-operator:images:promote:mcrouter name: openstack-operator:images:promote:mcrouter
parent: vexxhost-promote-docker-image parent: vexxhost-promote-docker-image
vars: *id002 vars: *id001
files: *id003 files: *id002
- project: - project:
check: check:
jobs: jobs:

19
zuul.d/memcached-exporter-jobs.yaml
View File

@ -2,26 +2,27 @@
name: openstack-operator:images:build:memcached-exporter name: openstack-operator:images:build:memcached-exporter
parent: vexxhost-build-docker-image parent: vexxhost-build-docker-image
provides: openstack-operator:image:memcached-exporter provides: openstack-operator:image:memcached-exporter
dependencies: &id001 vars: &id001
- opendev-buildset-registry
vars: &id002
docker_images: docker_images:
- context: images/memcached-exporter - context: images/memcached-exporter
repository: vexxhost/memcached-exporter repository: vexxhost/memcached-exporter
files: &id003 dependencies:
- openstack-operator:images:build:openstack-operator
files: &id002
- ^images/memcached-exporter/.* - ^images/memcached-exporter/.*
- job: - job:
name: openstack-operator:images:upload:memcached-exporter name: openstack-operator:images:upload:memcached-exporter
parent: vexxhost-upload-docker-image parent: vexxhost-upload-docker-image
provides: openstack-operator:image:memcached-exporter provides: openstack-operator:image:memcached-exporter
dependencies: *id001 vars: *id001
vars: *id002 dependencies:
files: *id003 - openstack-operator:images:upload:openstack-operator
files: *id002
- job: - job:
name: openstack-operator:images:promote:memcached-exporter name: openstack-operator:images:promote:memcached-exporter
parent: vexxhost-promote-docker-image parent: vexxhost-promote-docker-image
vars: *id002 vars: *id001
files: *id003 files: *id002
- project: - project:
check: check:
jobs: jobs:

19
zuul.d/memcached-jobs.yaml
View File

@ -2,26 +2,27 @@
name: openstack-operator:images:build:memcached name: openstack-operator:images:build:memcached
parent: vexxhost-build-docker-image parent: vexxhost-build-docker-image
provides: openstack-operator:image:memcached provides: openstack-operator:image:memcached
dependencies: &id001 vars: &id001
- opendev-buildset-registry
vars: &id002
docker_images: docker_images:
- context: images/memcached - context: images/memcached
repository: vexxhost/memcached repository: vexxhost/memcached
files: &id003 dependencies:
- openstack-operator:images:build:openstack-operator
files: &id002
- ^images/memcached/.* - ^images/memcached/.*
- job: - job:
name: openstack-operator:images:upload:memcached name: openstack-operator:images:upload:memcached
parent: vexxhost-upload-docker-image parent: vexxhost-upload-docker-image
provides: openstack-operator:image:memcached provides: openstack-operator:image:memcached
dependencies: *id001 vars: *id001
vars: *id002 dependencies:
files: *id003 - openstack-operator:images:upload:openstack-operator
files: *id002
- job: - job:
name: openstack-operator:images:promote:memcached name: openstack-operator:images:promote:memcached
parent: vexxhost-promote-docker-image parent: vexxhost-promote-docker-image
vars: *id002 vars: *id001
files: *id003 files: *id002
- project: - project:
check: check:
jobs: jobs:

9
zuul.d/openstack-operator-jobs.yaml
View File

@ -2,9 +2,7 @@
name: openstack-operator:images:build:openstack-operator name: openstack-operator:images:build:openstack-operator
parent: vexxhost-build-docker-image parent: vexxhost-build-docker-image
provides: openstack-operator:image:openstack-operator provides: openstack-operator:image:openstack-operator
dependencies: &id001 vars: &id001
- opendev-buildset-registry
vars: &id002
docker_images: docker_images:
- context: . - context: .
repository: vexxhost/openstack-operator repository: vexxhost/openstack-operator
@ -13,12 +11,11 @@
name: openstack-operator:images:upload:openstack-operator name: openstack-operator:images:upload:openstack-operator
parent: vexxhost-upload-docker-image parent: vexxhost-upload-docker-image
provides: openstack-operator:image:openstack-operator provides: openstack-operator:image:openstack-operator
dependencies: *id001 vars: *id001
vars: *id002
- job: - job:
name: openstack-operator:images:promote:openstack-operator name: openstack-operator:images:promote:openstack-operator
parent: vexxhost-promote-docker-image parent: vexxhost-promote-docker-image
vars: *id002 vars: *id001
- project: - project:
check: check:
jobs: jobs:

19
zuul.d/rabbitmq-jobs.yaml
View File

@ -2,26 +2,27 @@
name: openstack-operator:images:build:rabbitmq name: openstack-operator:images:build:rabbitmq
parent: vexxhost-build-docker-image parent: vexxhost-build-docker-image
provides: openstack-operator:image:rabbitmq provides: openstack-operator:image:rabbitmq
dependencies: &id001 vars: &id001
- opendev-buildset-registry
vars: &id002
docker_images: docker_images:
- context: images/rabbitmq - context: images/rabbitmq
repository: vexxhost/rabbitmq repository: vexxhost/rabbitmq
files: &id003 dependencies:
- openstack-operator:images:build:openstack-operator
files: &id002
- ^images/rabbitmq/.* - ^images/rabbitmq/.*
- job: - job:
name: openstack-operator:images:upload:rabbitmq name: openstack-operator:images:upload:rabbitmq
parent: vexxhost-upload-docker-image parent: vexxhost-upload-docker-image
provides: openstack-operator:image:rabbitmq provides: openstack-operator:image:rabbitmq
dependencies: *id001 vars: *id001
vars: *id002 dependencies:
files: *id003 - openstack-operator:images:upload:openstack-operator
files: *id002
- job: - job:
name: openstack-operator:images:promote:rabbitmq name: openstack-operator:images:promote:rabbitmq
parent: vexxhost-promote-docker-image parent: vexxhost-promote-docker-image
vars: *id002 vars: *id001
files: *id003 files: *id002
- project: - project:
check: check:
jobs: jobs: