Introduce container_registry for image prefix
Skip-Release-Notes
Change-Id: I80067f53aa2b63286b654fff782f0f7b65a2d050
diff --git a/zuul.d/container-images/barbican.yaml b/zuul.d/container-images/barbican.yaml
index 3a9caa8..e2ecc40 100644
--- a/zuul.d/container-images/barbican.yaml
+++ b/zuul.d/container-images/barbican.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/barbican
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/barbican
+ repository: "{{ container_registry }}/barbican"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=barbican
tags:
diff --git a/zuul.d/container-images/cinder.yaml b/zuul.d/container-images/cinder.yaml
index a755adf..e039bda 100644
--- a/zuul.d/container-images/cinder.yaml
+++ b/zuul.d/container-images/cinder.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/cinder
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/cinder
+ repository: "{{ container_registry }}/cinder"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=cinder
tags:
diff --git a/zuul.d/container-images/designate.yaml b/zuul.d/container-images/designate.yaml
index 41be3a7..fd02908 100644
--- a/zuul.d/container-images/designate.yaml
+++ b/zuul.d/container-images/designate.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/designate
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/designate
+ repository: "{{ container_registry }}/designate"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=designate
tags:
diff --git a/zuul.d/container-images/glance.yaml b/zuul.d/container-images/glance.yaml
index f158d35..411b5a4 100644
--- a/zuul.d/container-images/glance.yaml
+++ b/zuul.d/container-images/glance.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/glance
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/glance
+ repository: "{{ container_registry }}/glance"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=glance
tags:
diff --git a/zuul.d/container-images/heat.yaml b/zuul.d/container-images/heat.yaml
index 4c2fd87..98b3d2c 100644
--- a/zuul.d/container-images/heat.yaml
+++ b/zuul.d/container-images/heat.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/heat
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/heat
+ repository: "{{ container_registry }}/heat"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=heat
tags:
diff --git a/zuul.d/container-images/horizon.yaml b/zuul.d/container-images/horizon.yaml
index d3a713e..eb8872b 100644
--- a/zuul.d/container-images/horizon.yaml
+++ b/zuul.d/container-images/horizon.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/horizon
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/horizon
+ repository: "{{ container_registry }}/horizon"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=horizon
tags:
diff --git a/zuul.d/container-images/ironic.yaml b/zuul.d/container-images/ironic.yaml
index 18403e0..33a0d4d 100644
--- a/zuul.d/container-images/ironic.yaml
+++ b/zuul.d/container-images/ironic.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/ironic
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/ironic
+ repository: "{{ container_registry }}/ironic"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=ironic
tags:
diff --git a/zuul.d/container-images/keepalived.yaml b/zuul.d/container-images/keepalived.yaml
index e4f55ce..31e4a6c 100644
--- a/zuul.d/container-images/keepalived.yaml
+++ b/zuul.d/container-images/keepalived.yaml
@@ -36,10 +36,11 @@
container_images:
- context: images/keepalived
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/keepalived
+ repository: "{{ container_registry }}/keepalived"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/keystone.yaml b/zuul.d/container-images/keystone.yaml
index d3bc1b7..39d9d10 100644
--- a/zuul.d/container-images/keystone.yaml
+++ b/zuul.d/container-images/keystone.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/keystone
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/keystone
+ repository: "{{ container_registry }}/keystone"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=keystone
tags:
diff --git a/zuul.d/container-images/kubernetes-entrypoint.yaml b/zuul.d/container-images/kubernetes-entrypoint.yaml
index 03a2a39..8a1132f 100644
--- a/zuul.d/container-images/kubernetes-entrypoint.yaml
+++ b/zuul.d/container-images/kubernetes-entrypoint.yaml
@@ -34,7 +34,7 @@
container_images:
- context: images/kubernetes-entrypoint
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/kubernetes-entrypoint
+ repository: "{{ container_registry }}/kubernetes-entrypoint"
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/libvirtd.yaml b/zuul.d/container-images/libvirtd.yaml
index fc34df0..9b2596b 100644
--- a/zuul.d/container-images/libvirtd.yaml
+++ b/zuul.d/container-images/libvirtd.yaml
@@ -40,11 +40,12 @@
container_images:
- context: images/libvirtd
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/libvirtd
+ repository: "{{ container_registry }}/libvirtd"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=nova
tags:
diff --git a/zuul.d/container-images/magnum.yaml b/zuul.d/container-images/magnum.yaml
index 2772c95..71001a5 100644
--- a/zuul.d/container-images/magnum.yaml
+++ b/zuul.d/container-images/magnum.yaml
@@ -44,11 +44,12 @@
container_images:
- context: images/magnum
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/magnum
+ repository: "{{ container_registry }}/magnum"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=magnum
tags:
diff --git a/zuul.d/container-images/manila.yaml b/zuul.d/container-images/manila.yaml
index 893f9fe..f82fdea 100644
--- a/zuul.d/container-images/manila.yaml
+++ b/zuul.d/container-images/manila.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/manila
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/manila
+ repository: "{{ container_registry }}/manila"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=manila
tags:
diff --git a/zuul.d/container-images/netoffload.yaml b/zuul.d/container-images/netoffload.yaml
index 4e23e9e..4494d44 100644
--- a/zuul.d/container-images/netoffload.yaml
+++ b/zuul.d/container-images/netoffload.yaml
@@ -36,10 +36,11 @@
container_images:
- context: images/netoffload
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/netoffload
+ repository: "{{ container_registry }}/netoffload"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/neutron.yaml b/zuul.d/container-images/neutron.yaml
index 54594fd..b8dabca 100644
--- a/zuul.d/container-images/neutron.yaml
+++ b/zuul.d/container-images/neutron.yaml
@@ -44,11 +44,12 @@
container_images:
- context: images/neutron
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/neutron
+ repository: "{{ container_registry }}/neutron"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=neutron
tags:
diff --git a/zuul.d/container-images/nova-ssh.yaml b/zuul.d/container-images/nova-ssh.yaml
index 5d3e337..d60275d 100644
--- a/zuul.d/container-images/nova-ssh.yaml
+++ b/zuul.d/container-images/nova-ssh.yaml
@@ -40,11 +40,12 @@
container_images:
- context: images/nova-ssh
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/nova-ssh
+ repository: "{{ container_registry }}/nova-ssh"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=nova
- SHELL=/bin/bash
diff --git a/zuul.d/container-images/nova.yaml b/zuul.d/container-images/nova.yaml
index f377b8a..b037875 100644
--- a/zuul.d/container-images/nova.yaml
+++ b/zuul.d/container-images/nova.yaml
@@ -44,11 +44,12 @@
container_images:
- context: images/nova
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/nova
+ repository: "{{ container_registry }}/nova"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=nova
- SHELL=/bin/bash
diff --git a/zuul.d/container-images/octavia.yaml b/zuul.d/container-images/octavia.yaml
index 7912168..6710cb8 100644
--- a/zuul.d/container-images/octavia.yaml
+++ b/zuul.d/container-images/octavia.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/octavia
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/octavia
+ repository: "{{ container_registry }}/octavia"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=octavia
tags:
diff --git a/zuul.d/container-images/openstack-python-runtime.yaml b/zuul.d/container-images/openstack-python-runtime.yaml
index eaa403c..6256cb5 100644
--- a/zuul.d/container-images/openstack-python-runtime.yaml
+++ b/zuul.d/container-images/openstack-python-runtime.yaml
@@ -40,13 +40,14 @@
container_images:
- context: images/openstack-runtime
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/openstack-python-runtime
+ repository: "{{ container_registry }}/openstack-python-runtime"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- - "FROM=harbor.atmosphere.dev/library/python-base:{{ zuul.branch | replace('stable/', '') }}"
+ - "FROM={{ container_registry }}/python-base:{{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
files: &container_image_files
diff --git a/zuul.d/container-images/openstack-runtime.yaml b/zuul.d/container-images/openstack-runtime.yaml
index 33f5298..35a1b06 100644
--- a/zuul.d/container-images/openstack-runtime.yaml
+++ b/zuul.d/container-images/openstack-runtime.yaml
@@ -38,11 +38,12 @@
container_images:
- context: images/openstack-runtime
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/openstack-runtime
+ repository: "{{ container_registry }}/openstack-runtime"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/openstack-venv-builder.yaml b/zuul.d/container-images/openstack-venv-builder.yaml
index 844d203..c042bf8 100644
--- a/zuul.d/container-images/openstack-venv-builder.yaml
+++ b/zuul.d/container-images/openstack-venv-builder.yaml
@@ -40,11 +40,12 @@
container_images:
- context: images/openstack-venv-builder
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/openstack-venv-builder
+ repository: "{{ container_registry }}/openstack-venv-builder"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/openvswitch.yaml b/zuul.d/container-images/openvswitch.yaml
index f11caec..2ebec04 100644
--- a/zuul.d/container-images/openvswitch.yaml
+++ b/zuul.d/container-images/openvswitch.yaml
@@ -34,7 +34,7 @@
container_images:
- context: images/openvswitch
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/openvswitch
+ repository: "{{ container_registry }}/openvswitch"
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/ovn.yaml b/zuul.d/container-images/ovn.yaml
index 83d4aca..07fa151 100644
--- a/zuul.d/container-images/ovn.yaml
+++ b/zuul.d/container-images/ovn.yaml
@@ -36,21 +36,23 @@
container_images:
- context: images/ovn
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/ovn-central
+ repository: "{{ container_registry }}/ovn-central"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- OVN_COMPONENT=central
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
- context: images/ovn
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/ovn-host
+ repository: "{{ container_registry }}/ovn-host"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- OVN_COMPONENT=host
tags:
diff --git a/zuul.d/container-images/placement.yaml b/zuul.d/container-images/placement.yaml
index c892dc4..945f341 100644
--- a/zuul.d/container-images/placement.yaml
+++ b/zuul.d/container-images/placement.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/placement
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/placement
+ repository: "{{ container_registry }}/placement"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=placement
tags:
diff --git a/zuul.d/container-images/python-base.yaml b/zuul.d/container-images/python-base.yaml
index dae0fd3..90e5acf 100644
--- a/zuul.d/container-images/python-base.yaml
+++ b/zuul.d/container-images/python-base.yaml
@@ -38,11 +38,12 @@
container_images:
- context: images/python-base
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/python-base
+ repository: "{{ container_registry }}/python-base"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/python-openstackclient.yaml b/zuul.d/container-images/python-openstackclient.yaml
index f05b9b5..cfb9826 100644
--- a/zuul.d/container-images/python-openstackclient.yaml
+++ b/zuul.d/container-images/python-openstackclient.yaml
@@ -42,10 +42,11 @@
container_images:
- context: images/python-openstackclient
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/python-openstackclient
+ repository: "{{ container_registry }}/python-openstackclient"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/staffeln.yaml b/zuul.d/container-images/staffeln.yaml
index 30cb920..77200c2 100644
--- a/zuul.d/container-images/staffeln.yaml
+++ b/zuul.d/container-images/staffeln.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/staffeln
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/staffeln
+ repository: "{{ container_registry }}/staffeln"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=staffeln
tags:
diff --git a/zuul.d/container-images/tempest.yaml b/zuul.d/container-images/tempest.yaml
index ead0bdb..22dd426 100644
--- a/zuul.d/container-images/tempest.yaml
+++ b/zuul.d/container-images/tempest.yaml
@@ -44,10 +44,11 @@
container_images:
- context: images/tempest
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/tempest
+ repository: "{{ container_registry }}/tempest"
arch:
- linux/amd64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- PROJECT=tempest
tags:
diff --git a/zuul.d/container-images/ubuntu-cloud-archive.yaml b/zuul.d/container-images/ubuntu-cloud-archive.yaml
index aab44f8..69e826e 100644
--- a/zuul.d/container-images/ubuntu-cloud-archive.yaml
+++ b/zuul.d/container-images/ubuntu-cloud-archive.yaml
@@ -36,11 +36,12 @@
container_images:
- context: images/ubuntu-cloud-archive
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/ubuntu-cloud-archive
+ repository: "{{ container_registry }}/ubuntu-cloud-archive"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/container-images/ubuntu.yaml b/zuul.d/container-images/ubuntu.yaml
index 6c90f69..2b54f92 100644
--- a/zuul.d/container-images/ubuntu.yaml
+++ b/zuul.d/container-images/ubuntu.yaml
@@ -34,11 +34,12 @@
container_images:
- context: images/ubuntu
registry: harbor.atmosphere.dev
- repository: harbor.atmosphere.dev/library/ubuntu
+ repository: "{{ container_registry }}/ubuntu"
arch:
- linux/amd64
- linux/arm64
build_args:
+ - REGISTRY={{ container_registry }}
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 8675841..d8413e9 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -158,3 +158,5 @@
dependencies: *molecule_check_dependencies
- atmosphere-molecule-aio-upgrade-2023.2-ovn:
dependencies: *molecule_check_dependencies
+ vars:
+ container_registry: harbor.atmosphere.dev/library