Merge "Drop un-used upload job" into main
diff --git a/build/lint-jobs.py b/build/lint-jobs.py
index 3edfe12..7233dd3 100644
--- a/build/lint-jobs.py
+++ b/build/lint-jobs.py
@@ -14,11 +14,8 @@
if "job" in config:
job = config["job"]
- # Check if build or upload jobs are missing 'atmosphere-buildset-registry' dependency
- if (
- "build-container-image-" in job["name"]
- or "upload-container-image-" in job["name"]
- ):
+ # Check if build jobs are missing 'atmosphere-buildset-registry' dependency
+ if "build-container-image-" in job["name"]:
deps = job.get("dependencies", [])
if not any(
dep.get("name") == "atmosphere-buildset-registry"
@@ -30,9 +27,7 @@
passed = False
if passed:
- print(
- "All build and upload jobs have 'atmosphere-buildset-registry' dependency."
- )
+ print("All build jobs have 'atmosphere-buildset-registry' dependency.")
else:
print("Jobs missing 'atmosphere-buildset-registry' dependency.")
sys.exit(1)
diff --git a/releasenotes/notes/drop-extra-jobs-9d885e9f951c0f3f.yaml b/releasenotes/notes/drop-extra-jobs-9d885e9f951c0f3f.yaml
new file mode 100644
index 0000000..0a5131a
--- /dev/null
+++ b/releasenotes/notes/drop-extra-jobs-9d885e9f951c0f3f.yaml
@@ -0,0 +1,5 @@
+---
+other:
+ - The ``upload`` jobs have been removed from the ``gate`` pipeline and
+ replaced by the same ``build`` jobs since we use the intermediate
+ registry to store the images.
diff --git a/zuul.d/container-images/barbican.yaml b/zuul.d/container-images/barbican.yaml
index e2ecc40..ca1f0c0 100644
--- a/zuul.d/container-images/barbican.yaml
+++ b/zuul.d/container-images/barbican.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-barbican
gate:
jobs:
- - atmosphere-upload-container-image-barbican
+ - atmosphere-build-container-image-barbican
promote:
jobs:
- atmosphere-promote-container-image-barbican
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-barbican
+ promote_container_image_job: atmosphere-build-container-image-barbican
container_images:
- context: images/barbican
registry: harbor.atmosphere.dev
@@ -62,25 +62,6 @@
- images/barbican/.*
- job:
- name: atmosphere-upload-container-image-barbican
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-barbican
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/base.yaml b/zuul.d/container-images/base.yaml
index ae2991e..0be248f 100644
--- a/zuul.d/container-images/base.yaml
+++ b/zuul.d/container-images/base.yaml
@@ -44,15 +44,6 @@
- ['harbor.atmosphere.dev', 'https://harbor.atmosphere.dev']
- job:
- name: atmosphere-upload-container-image
- parent: ci-upload-container-image
- abstract: true
- irrelevant-files:
- - ^doc/
- - ^releasenotes/
- vars: *image_vars
-
-- job:
name: atmosphere-promote-container-image
parent: ci-promote-container-image
irrelevant-files:
diff --git a/zuul.d/container-images/cinder.yaml b/zuul.d/container-images/cinder.yaml
index e039bda..e5393ba 100644
--- a/zuul.d/container-images/cinder.yaml
+++ b/zuul.d/container-images/cinder.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-cinder
gate:
jobs:
- - atmosphere-upload-container-image-cinder
+ - atmosphere-build-container-image-cinder
promote:
jobs:
- atmosphere-promote-container-image-cinder
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-cinder
+ promote_container_image_job: atmosphere-build-container-image-cinder
container_images:
- context: images/cinder
registry: harbor.atmosphere.dev
@@ -62,25 +62,6 @@
- images/cinder/.*
- job:
- name: atmosphere-upload-container-image-cinder
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-cinder
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/designate.yaml b/zuul.d/container-images/designate.yaml
index fd02908..1f4b19b 100644
--- a/zuul.d/container-images/designate.yaml
+++ b/zuul.d/container-images/designate.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-designate
gate:
jobs:
- - atmosphere-upload-container-image-designate
+ - atmosphere-build-container-image-designate
promote:
jobs:
- atmosphere-promote-container-image-designate
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-designate
+ promote_container_image_job: atmosphere-build-container-image-designate
container_images:
- context: images/designate
registry: harbor.atmosphere.dev
@@ -62,25 +62,6 @@
- images/designate/.*
- job:
- name: atmosphere-upload-container-image-designate
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-designate
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/glance.yaml b/zuul.d/container-images/glance.yaml
index 411b5a4..5cfc43c 100644
--- a/zuul.d/container-images/glance.yaml
+++ b/zuul.d/container-images/glance.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-glance
gate:
jobs:
- - atmosphere-upload-container-image-glance
+ - atmosphere-build-container-image-glance
promote:
jobs:
- atmosphere-promote-container-image-glance
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-glance
+ promote_container_image_job: atmosphere-build-container-image-glance
container_images:
- context: images/glance
registry: harbor.atmosphere.dev
@@ -62,25 +62,6 @@
- images/glance/.*
- job:
- name: atmosphere-upload-container-image-glance
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-glance
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/heat.yaml b/zuul.d/container-images/heat.yaml
index 98b3d2c..c6970eb 100644
--- a/zuul.d/container-images/heat.yaml
+++ b/zuul.d/container-images/heat.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-heat
gate:
jobs:
- - atmosphere-upload-container-image-heat
+ - atmosphere-build-container-image-heat
promote:
jobs:
- atmosphere-promote-container-image-heat
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-heat
+ promote_container_image_job: atmosphere-build-container-image-heat
container_images:
- context: images/heat
registry: harbor.atmosphere.dev
@@ -62,25 +62,6 @@
- images/heat/.*
- job:
- name: atmosphere-upload-container-image-heat
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-heat
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/horizon.yaml b/zuul.d/container-images/horizon.yaml
index eb8872b..d1f65ad 100644
--- a/zuul.d/container-images/horizon.yaml
+++ b/zuul.d/container-images/horizon.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-horizon
gate:
jobs:
- - atmosphere-upload-container-image-horizon
+ - atmosphere-build-container-image-horizon
promote:
jobs:
- atmosphere-promote-container-image-horizon
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-horizon
+ promote_container_image_job: atmosphere-build-container-image-horizon
container_images:
- context: images/horizon
registry: harbor.atmosphere.dev
@@ -62,25 +62,6 @@
- images/horizon/.*
- job:
- name: atmosphere-upload-container-image-horizon
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-horizon
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/ironic.yaml b/zuul.d/container-images/ironic.yaml
index 33a0d4d..0a93e62 100644
--- a/zuul.d/container-images/ironic.yaml
+++ b/zuul.d/container-images/ironic.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-ironic
gate:
jobs:
- - atmosphere-upload-container-image-ironic
+ - atmosphere-build-container-image-ironic
promote:
jobs:
- atmosphere-promote-container-image-ironic
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-ironic
+ promote_container_image_job: atmosphere-build-container-image-ironic
container_images:
- context: images/ironic
registry: harbor.atmosphere.dev
@@ -62,25 +62,6 @@
- images/ironic/.*
- job:
- name: atmosphere-upload-container-image-ironic
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-ironic
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/keepalived.yaml b/zuul.d/container-images/keepalived.yaml
index 31e4a6c..28677be 100644
--- a/zuul.d/container-images/keepalived.yaml
+++ b/zuul.d/container-images/keepalived.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-keepalived
gate:
jobs:
- - atmosphere-upload-container-image-keepalived
+ - atmosphere-build-container-image-keepalived
promote:
jobs:
- atmosphere-promote-container-image-keepalived
@@ -32,7 +32,7 @@
- name: atmosphere-build-container-image-ubuntu
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-keepalived
+ promote_container_image_job: atmosphere-build-container-image-keepalived
container_images:
- context: images/keepalived
registry: harbor.atmosphere.dev
@@ -49,17 +49,6 @@
- images/keepalived/.*
- job:
- name: atmosphere-upload-container-image-keepalived
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-keepalived
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/keystone.yaml b/zuul.d/container-images/keystone.yaml
index 39d9d10..555a980 100644
--- a/zuul.d/container-images/keystone.yaml
+++ b/zuul.d/container-images/keystone.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-keystone
gate:
jobs:
- - atmosphere-upload-container-image-keystone
+ - atmosphere-build-container-image-keystone
promote:
jobs:
- atmosphere-promote-container-image-keystone
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-keystone
+ promote_container_image_job: atmosphere-build-container-image-keystone
container_images:
- context: images/keystone
registry: harbor.atmosphere.dev
@@ -62,25 +62,6 @@
- images/keystone/.*
- job:
- name: atmosphere-upload-container-image-keystone
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-keystone
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/kubernetes-entrypoint.yaml b/zuul.d/container-images/kubernetes-entrypoint.yaml
index 8a1132f..593e1ca 100644
--- a/zuul.d/container-images/kubernetes-entrypoint.yaml
+++ b/zuul.d/container-images/kubernetes-entrypoint.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-kubernetes-entrypoint
gate:
jobs:
- - atmosphere-upload-container-image-kubernetes-entrypoint
+ - atmosphere-build-container-image-kubernetes-entrypoint
promote:
jobs:
- atmosphere-promote-container-image-kubernetes-entrypoint
@@ -30,7 +30,7 @@
- name: atmosphere-buildset-registry
soft: false
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-kubernetes-entrypoint
+ promote_container_image_job: atmosphere-build-container-image-kubernetes-entrypoint
container_images:
- context: images/kubernetes-entrypoint
registry: harbor.atmosphere.dev
@@ -44,15 +44,6 @@
- images/kubernetes-entrypoint/.*
- job:
- name: atmosphere-upload-container-image-kubernetes-entrypoint
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-kubernetes-entrypoint
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/libvirtd.yaml b/zuul.d/container-images/libvirtd.yaml
index 9b2596b..ac0e1ba 100644
--- a/zuul.d/container-images/libvirtd.yaml
+++ b/zuul.d/container-images/libvirtd.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-libvirtd
gate:
jobs:
- - atmosphere-upload-container-image-libvirtd
+ - atmosphere-build-container-image-libvirtd
promote:
jobs:
- atmosphere-promote-container-image-libvirtd
@@ -36,7 +36,7 @@
- name: atmosphere-build-container-image-openstack-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-libvirtd
+ promote_container_image_job: atmosphere-build-container-image-libvirtd
container_images:
- context: images/libvirtd
registry: harbor.atmosphere.dev
@@ -57,21 +57,6 @@
- images/libvirtd/.*
- job:
- name: atmosphere-upload-container-image-libvirtd
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-openstack-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-libvirtd
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/magnum.yaml b/zuul.d/container-images/magnum.yaml
index 71001a5..34f400e 100644
--- a/zuul.d/container-images/magnum.yaml
+++ b/zuul.d/container-images/magnum.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-magnum
gate:
jobs:
- - atmosphere-upload-container-image-magnum
+ - atmosphere-build-container-image-magnum
promote:
jobs:
- atmosphere-promote-container-image-magnum
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-magnum
+ promote_container_image_job: atmosphere-build-container-image-magnum
container_images:
- context: images/magnum
registry: harbor.atmosphere.dev
@@ -63,25 +63,6 @@
- images/magnum/.*
- job:
- name: atmosphere-upload-container-image-magnum
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-magnum
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/manila.yaml b/zuul.d/container-images/manila.yaml
index f82fdea..7ce412c 100644
--- a/zuul.d/container-images/manila.yaml
+++ b/zuul.d/container-images/manila.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-manila
gate:
jobs:
- - atmosphere-upload-container-image-manila
+ - atmosphere-build-container-image-manila
promote:
jobs:
- atmosphere-promote-container-image-manila
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-manila
+ promote_container_image_job: atmosphere-build-container-image-manila
container_images:
- context: images/manila
registry: harbor.atmosphere.dev
@@ -62,25 +62,6 @@
- images/manila/.*
- job:
- name: atmosphere-upload-container-image-manila
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-manila
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/netoffload.yaml b/zuul.d/container-images/netoffload.yaml
index 4494d44..7236c12 100644
--- a/zuul.d/container-images/netoffload.yaml
+++ b/zuul.d/container-images/netoffload.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-netoffload
gate:
jobs:
- - atmosphere-upload-container-image-netoffload
+ - atmosphere-build-container-image-netoffload
promote:
jobs:
- atmosphere-promote-container-image-netoffload
@@ -32,7 +32,7 @@
- name: atmosphere-build-container-image-ubuntu
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-netoffload
+ promote_container_image_job: atmosphere-build-container-image-netoffload
container_images:
- context: images/netoffload
registry: harbor.atmosphere.dev
@@ -49,17 +49,6 @@
- images/netoffload/.*
- job:
- name: atmosphere-upload-container-image-netoffload
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-netoffload
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/neutron.yaml b/zuul.d/container-images/neutron.yaml
index b8dabca..ee2113a 100644
--- a/zuul.d/container-images/neutron.yaml
+++ b/zuul.d/container-images/neutron.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-neutron
gate:
jobs:
- - atmosphere-upload-container-image-neutron
+ - atmosphere-build-container-image-neutron
promote:
jobs:
- atmosphere-promote-container-image-neutron
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-neutron
+ promote_container_image_job: atmosphere-build-container-image-neutron
container_images:
- context: images/neutron
registry: harbor.atmosphere.dev
@@ -63,25 +63,6 @@
- images/neutron/.*
- job:
- name: atmosphere-upload-container-image-neutron
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-neutron
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/nova-ssh.yaml b/zuul.d/container-images/nova-ssh.yaml
index d60275d..e60df3e 100644
--- a/zuul.d/container-images/nova-ssh.yaml
+++ b/zuul.d/container-images/nova-ssh.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-nova-ssh
gate:
jobs:
- - atmosphere-upload-container-image-nova-ssh
+ - atmosphere-build-container-image-nova-ssh
promote:
jobs:
- atmosphere-promote-container-image-nova-ssh
@@ -36,7 +36,7 @@
- name: atmosphere-build-container-image-openstack-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-nova-ssh
+ promote_container_image_job: atmosphere-build-container-image-nova-ssh
container_images:
- context: images/nova-ssh
registry: harbor.atmosphere.dev
@@ -58,21 +58,6 @@
- images/nova-ssh/.*
- job:
- name: atmosphere-upload-container-image-nova-ssh
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-openstack-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-nova-ssh
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/nova.yaml b/zuul.d/container-images/nova.yaml
index b037875..eca6875 100644
--- a/zuul.d/container-images/nova.yaml
+++ b/zuul.d/container-images/nova.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-nova
gate:
jobs:
- - atmosphere-upload-container-image-nova
+ - atmosphere-build-container-image-nova
promote:
jobs:
- atmosphere-promote-container-image-nova
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-nova
+ promote_container_image_job: atmosphere-build-container-image-nova
container_images:
- context: images/nova
registry: harbor.atmosphere.dev
@@ -64,25 +64,6 @@
- images/nova/.*
- job:
- name: atmosphere-upload-container-image-nova
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-nova
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/octavia.yaml b/zuul.d/container-images/octavia.yaml
index 6710cb8..5089cd9 100644
--- a/zuul.d/container-images/octavia.yaml
+++ b/zuul.d/container-images/octavia.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-octavia
gate:
jobs:
- - atmosphere-upload-container-image-octavia
+ - atmosphere-build-container-image-octavia
promote:
jobs:
- atmosphere-promote-container-image-octavia
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-octavia
+ promote_container_image_job: atmosphere-build-container-image-octavia
container_images:
- context: images/octavia
registry: harbor.atmosphere.dev
@@ -62,25 +62,6 @@
- images/octavia/.*
- job:
- name: atmosphere-upload-container-image-octavia
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-octavia
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/openstack-python-runtime.yaml b/zuul.d/container-images/openstack-python-runtime.yaml
index 6256cb5..7d4302b 100644
--- a/zuul.d/container-images/openstack-python-runtime.yaml
+++ b/zuul.d/container-images/openstack-python-runtime.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-openstack-python-runtime
gate:
jobs:
- - atmosphere-upload-container-image-openstack-python-runtime
+ - atmosphere-build-container-image-openstack-python-runtime
promote:
jobs:
- atmosphere-promote-container-image-openstack-python-runtime
@@ -36,7 +36,7 @@
- name: atmosphere-build-container-image-python-base
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-openstack-python-runtime
+ promote_container_image_job: atmosphere-build-container-image-openstack-python-runtime
container_images:
- context: images/openstack-runtime
registry: harbor.atmosphere.dev
@@ -57,21 +57,6 @@
- images/openstack-runtime/.*
- job:
- name: atmosphere-upload-container-image-openstack-python-runtime
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-openstack-python-runtime
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/openstack-runtime.yaml b/zuul.d/container-images/openstack-runtime.yaml
index 35a1b06..21b0de0 100644
--- a/zuul.d/container-images/openstack-runtime.yaml
+++ b/zuul.d/container-images/openstack-runtime.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-openstack-runtime
gate:
jobs:
- - atmosphere-upload-container-image-openstack-runtime
+ - atmosphere-build-container-image-openstack-runtime
promote:
jobs:
- atmosphere-promote-container-image-openstack-runtime
@@ -34,7 +34,7 @@
- name: atmosphere-build-container-image-ubuntu-cloud-archive
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-openstack-runtime
+ promote_container_image_job: atmosphere-build-container-image-openstack-runtime
container_images:
- context: images/openstack-runtime
registry: harbor.atmosphere.dev
@@ -53,19 +53,6 @@
- images/openstack-runtime/.*
- job:
- name: atmosphere-upload-container-image-openstack-runtime
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-openstack-runtime
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/openstack-venv-builder.yaml b/zuul.d/container-images/openstack-venv-builder.yaml
index c042bf8..68bae33 100644
--- a/zuul.d/container-images/openstack-venv-builder.yaml
+++ b/zuul.d/container-images/openstack-venv-builder.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-openstack-venv-builder
gate:
jobs:
- - atmosphere-upload-container-image-openstack-venv-builder
+ - atmosphere-build-container-image-openstack-venv-builder
promote:
jobs:
- atmosphere-promote-container-image-openstack-venv-builder
@@ -36,7 +36,7 @@
- name: atmosphere-build-container-image-python-base
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-openstack-venv-builder
+ promote_container_image_job: atmosphere-build-container-image-openstack-venv-builder
container_images:
- context: images/openstack-venv-builder
registry: harbor.atmosphere.dev
@@ -56,21 +56,6 @@
- images/openstack-venv-builder/.*
- job:
- name: atmosphere-upload-container-image-openstack-venv-builder
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-openstack-venv-builder
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/openvswitch.yaml b/zuul.d/container-images/openvswitch.yaml
index 2ebec04..0d8edfd 100644
--- a/zuul.d/container-images/openvswitch.yaml
+++ b/zuul.d/container-images/openvswitch.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-openvswitch
gate:
jobs:
- - atmosphere-upload-container-image-openvswitch
+ - atmosphere-build-container-image-openvswitch
promote:
jobs:
- atmosphere-promote-container-image-openvswitch
@@ -30,7 +30,7 @@
- name: atmosphere-buildset-registry
soft: false
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-openvswitch
+ promote_container_image_job: atmosphere-build-container-image-openvswitch
container_images:
- context: images/openvswitch
registry: harbor.atmosphere.dev
@@ -44,15 +44,6 @@
- images/openvswitch/.*
- job:
- name: atmosphere-upload-container-image-openvswitch
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-openvswitch
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/ovn.yaml b/zuul.d/container-images/ovn.yaml
index 07fa151..882b0d5 100644
--- a/zuul.d/container-images/ovn.yaml
+++ b/zuul.d/container-images/ovn.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-ovn
gate:
jobs:
- - atmosphere-upload-container-image-ovn
+ - atmosphere-build-container-image-ovn
promote:
jobs:
- atmosphere-promote-container-image-ovn
@@ -32,7 +32,7 @@
- name: atmosphere-build-container-image-openvswitch
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-ovn
+ promote_container_image_job: atmosphere-build-container-image-ovn
container_images:
- context: images/ovn
registry: harbor.atmosphere.dev
@@ -62,17 +62,6 @@
- images/ovn/.*
- job:
- name: atmosphere-upload-container-image-ovn
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-openvswitch
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-ovn
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/placement.yaml b/zuul.d/container-images/placement.yaml
index 945f341..fe491d4 100644
--- a/zuul.d/container-images/placement.yaml
+++ b/zuul.d/container-images/placement.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-placement
gate:
jobs:
- - atmosphere-upload-container-image-placement
+ - atmosphere-build-container-image-placement
promote:
jobs:
- atmosphere-promote-container-image-placement
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-placement
+ promote_container_image_job: atmosphere-build-container-image-placement
container_images:
- context: images/placement
registry: harbor.atmosphere.dev
@@ -62,25 +62,6 @@
- images/placement/.*
- job:
- name: atmosphere-upload-container-image-placement
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-placement
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/python-base.yaml b/zuul.d/container-images/python-base.yaml
index 90e5acf..2b2bb0a 100644
--- a/zuul.d/container-images/python-base.yaml
+++ b/zuul.d/container-images/python-base.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-python-base
gate:
jobs:
- - atmosphere-upload-container-image-python-base
+ - atmosphere-build-container-image-python-base
promote:
jobs:
- atmosphere-promote-container-image-python-base
@@ -34,7 +34,7 @@
- name: atmosphere-build-container-image-ubuntu-cloud-archive
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-python-base
+ promote_container_image_job: atmosphere-build-container-image-python-base
container_images:
- context: images/python-base
registry: harbor.atmosphere.dev
@@ -53,19 +53,6 @@
- images/python-base/.*
- job:
- name: atmosphere-upload-container-image-python-base
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-python-base
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/python-openstackclient.yaml b/zuul.d/container-images/python-openstackclient.yaml
index cfb9826..435bcfb 100644
--- a/zuul.d/container-images/python-openstackclient.yaml
+++ b/zuul.d/container-images/python-openstackclient.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-python-openstackclient
gate:
jobs:
- - atmosphere-upload-container-image-python-openstackclient
+ - atmosphere-build-container-image-python-openstackclient
promote:
jobs:
- atmosphere-promote-container-image-python-openstackclient
@@ -38,7 +38,7 @@
- name: atmosphere-build-container-image-openstack-venv-builder
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-python-openstackclient
+ promote_container_image_job: atmosphere-build-container-image-python-openstackclient
container_images:
- context: images/python-openstackclient
registry: harbor.atmosphere.dev
@@ -58,23 +58,6 @@
- images/python-openstackclient/.*
- job:
- name: atmosphere-upload-container-image-python-openstackclient
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-python-openstackclient
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/staffeln.yaml b/zuul.d/container-images/staffeln.yaml
index 77200c2..67070dd 100644
--- a/zuul.d/container-images/staffeln.yaml
+++ b/zuul.d/container-images/staffeln.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-staffeln
gate:
jobs:
- - atmosphere-upload-container-image-staffeln
+ - atmosphere-build-container-image-staffeln
promote:
jobs:
- atmosphere-promote-container-image-staffeln
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-staffeln
+ promote_container_image_job: atmosphere-build-container-image-staffeln
container_images:
- context: images/staffeln
registry: harbor.atmosphere.dev
@@ -62,25 +62,6 @@
- images/staffeln/.*
- job:
- name: atmosphere-upload-container-image-staffeln
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-staffeln
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/tempest.yaml b/zuul.d/container-images/tempest.yaml
index 22dd426..af9bafe 100644
--- a/zuul.d/container-images/tempest.yaml
+++ b/zuul.d/container-images/tempest.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-tempest
gate:
jobs:
- - atmosphere-upload-container-image-tempest
+ - atmosphere-build-container-image-tempest
promote:
jobs:
- atmosphere-promote-container-image-tempest
@@ -40,7 +40,7 @@
- name: atmosphere-build-container-image-openstack-python-runtime
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-tempest
+ promote_container_image_job: atmosphere-build-container-image-tempest
container_images:
- context: images/tempest
registry: harbor.atmosphere.dev
@@ -62,25 +62,6 @@
- images/tempest/.*
- job:
- name: atmosphere-upload-container-image-tempest
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- - name: atmosphere-upload-container-image-ubuntu-cloud-archive
- soft: true
- - name: atmosphere-upload-container-image-python-base
- soft: true
- - name: atmosphere-upload-container-image-openstack-venv-builder
- soft: true
- - name: atmosphere-upload-container-image-openstack-python-runtime
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-tempest
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/ubuntu-cloud-archive.yaml b/zuul.d/container-images/ubuntu-cloud-archive.yaml
index 69e826e..2e7431b 100644
--- a/zuul.d/container-images/ubuntu-cloud-archive.yaml
+++ b/zuul.d/container-images/ubuntu-cloud-archive.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-ubuntu-cloud-archive
gate:
jobs:
- - atmosphere-upload-container-image-ubuntu-cloud-archive
+ - atmosphere-build-container-image-ubuntu-cloud-archive
promote:
jobs:
- atmosphere-promote-container-image-ubuntu-cloud-archive
@@ -32,7 +32,7 @@
- name: atmosphere-build-container-image-ubuntu
soft: true
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-ubuntu-cloud-archive
+ promote_container_image_job: atmosphere-build-container-image-ubuntu-cloud-archive
container_images:
- context: images/ubuntu-cloud-archive
registry: harbor.atmosphere.dev
@@ -50,17 +50,6 @@
- images/ubuntu-cloud-archive/.*
- job:
- name: atmosphere-upload-container-image-ubuntu-cloud-archive
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- - name: atmosphere-upload-container-image-ubuntu
- soft: true
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-ubuntu-cloud-archive
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/container-images/ubuntu.yaml b/zuul.d/container-images/ubuntu.yaml
index 2b54f92..886aa64 100644
--- a/zuul.d/container-images/ubuntu.yaml
+++ b/zuul.d/container-images/ubuntu.yaml
@@ -18,7 +18,7 @@
- atmosphere-build-container-image-ubuntu
gate:
jobs:
- - atmosphere-upload-container-image-ubuntu
+ - atmosphere-build-container-image-ubuntu
promote:
jobs:
- atmosphere-promote-container-image-ubuntu
@@ -30,7 +30,7 @@
- name: atmosphere-buildset-registry
soft: false
vars: &container_image_vars
- promote_container_image_job: atmosphere-upload-container-image-ubuntu
+ promote_container_image_job: atmosphere-build-container-image-ubuntu
container_images:
- context: images/ubuntu
registry: harbor.atmosphere.dev
@@ -47,15 +47,6 @@
- images/ubuntu/.*
- job:
- name: atmosphere-upload-container-image-ubuntu
- parent: atmosphere-upload-container-image
- dependencies:
- - name: atmosphere-buildset-registry
- soft: false
- vars: *container_image_vars
- files: *container_image_files
-
-- job:
name: atmosphere-promote-container-image-ubuntu
parent: atmosphere-promote-container-image
vars: *container_image_vars
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index f5f357a..4c40927 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -24,7 +24,7 @@
- atmosphere-tox-helm-unittest
- atmosphere-tox-py3
- atmosphere-build-collection:
- dependencies: &molecule_check_dependencies
+ dependencies: &image_build_jobs
- name: atmosphere-build-container-image-barbican
soft: true
- name: atmosphere-build-container-image-cinder
@@ -74,15 +74,15 @@
- name: atmosphere-build-container-image-tempest
soft: true
- atmosphere-molecule-aio-keycloak:
- dependencies: *molecule_check_dependencies
+ dependencies: *image_build_jobs
- atmosphere-molecule-aio-openvswitch:
- dependencies: *molecule_check_dependencies
+ dependencies: *image_build_jobs
- atmosphere-molecule-aio-ovn:
- dependencies: *molecule_check_dependencies
+ dependencies: *image_build_jobs
- atmosphere-molecule-csi-local-path-provisioner:
- dependencies: *molecule_check_dependencies
+ dependencies: *image_build_jobs
- atmosphere-molecule-csi-rbd:
- dependencies: *molecule_check_dependencies
+ dependencies: *image_build_jobs
gate:
jobs:
- atmosphere-chart-vendor
@@ -91,73 +91,25 @@
- atmosphere-linters
- atmosphere-tox-py3
- atmosphere-build-collection:
- dependencies: &molecule_gate_dependencies
- - name: atmosphere-upload-container-image-barbican
- soft: true
- - name: atmosphere-upload-container-image-cinder
- soft: true
- - name: atmosphere-upload-container-image-designate
- soft: true
- - name: atmosphere-upload-container-image-glance
- soft: true
- - name: atmosphere-upload-container-image-heat
- soft: true
- - name: atmosphere-upload-container-image-horizon
- soft: true
- - name: atmosphere-upload-container-image-ironic
- soft: true
- - name: atmosphere-upload-container-image-keepalived
- soft: true
- - name: atmosphere-upload-container-image-keystone
- soft: true
- - name: atmosphere-upload-container-image-kubernetes-entrypoint
- soft: true
- - name: atmosphere-upload-container-image-libvirtd
- soft: true
- - name: atmosphere-upload-container-image-magnum
- soft: true
- - name: atmosphere-upload-container-image-manila
- soft: true
- - name: atmosphere-upload-container-image-netoffload
- soft: true
- - name: atmosphere-upload-container-image-neutron
- soft: true
- - name: atmosphere-upload-container-image-nova
- soft: true
- - name: atmosphere-upload-container-image-nova-ssh
- soft: true
- - name: atmosphere-upload-container-image-octavia
- soft: true
- - name: atmosphere-upload-container-image-openvswitch
- soft: true
- - name: atmosphere-upload-container-image-ovn
- soft: true
- - name: atmosphere-upload-container-image-placement
- soft: true
- - name: atmosphere-upload-container-image-python-openstackclient
- soft: true
- - name: atmosphere-upload-container-image-staffeln
- soft: true
- - name: atmosphere-upload-container-image-tempest
- soft: true
+ dependencies: *image_build_jobs
- atmosphere-molecule-aio-keycloak:
- dependencies: *molecule_gate_dependencies
+ dependencies: *image_build_jobs
- atmosphere-molecule-aio-openvswitch:
- dependencies: *molecule_gate_dependencies
+ dependencies: *image_build_jobs
- atmosphere-molecule-aio-ovn:
- dependencies: *molecule_gate_dependencies
+ dependencies: *image_build_jobs
- atmosphere-molecule-csi-local-path-provisioner:
- dependencies: *molecule_gate_dependencies
+ dependencies: *image_build_jobs
- atmosphere-molecule-csi-rbd:
- dependencies: *molecule_gate_dependencies
+ dependencies: *image_build_jobs
release:
jobs:
- atmosphere-publish-collection
periodic:
jobs:
- atmosphere-molecule-aio-upgrade-openvswitch:
- dependencies: *molecule_check_dependencies
+ dependencies: *image_build_jobs
- atmosphere-molecule-aio-upgrade-ovn:
- dependencies: *molecule_check_dependencies
+ dependencies: *image_build_jobs
vars:
container_registry: harbor.atmosphere.dev/library