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

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,

tox.ini

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

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:

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

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:

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:

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:

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:

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:

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: