[stable/2023.2] Stop using CDN for CI (#2185) (#2195)
Switch image builds to use Harbor
Switch Zuul to avoid CDN
Small more fixes
Configure CI bits to not use CDN
fixes #2188
diff --git a/zuul.d/container-images/barbican.yaml b/zuul.d/container-images/barbican.yaml
index da767db..3a9caa8 100644
--- a/zuul.d/container-images/barbican.yaml
+++ b/zuul.d/container-images/barbican.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-barbican
container_images:
- context: images/barbican
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/barbican
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/barbican
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/base.yaml b/zuul.d/container-images/base.yaml
index 021dbfc..32567c5 100644
--- a/zuul.d/container-images/base.yaml
+++ b/zuul.d/container-images/base.yaml
@@ -39,7 +39,7 @@
- ['docker.io', 'https://registry-1.docker.io']
- ['quay.io', 'https://quay.io']
- ['gcr.io', 'https://gcr.io']
- - ['registry.atmosphere.dev', 'https://registry.atmosphere.dev']
+ - ['harbor.atmosphere.dev', 'https://harbor.atmosphere.dev']
- job:
name: atmosphere-upload-container-image
diff --git a/zuul.d/container-images/cinder.yaml b/zuul.d/container-images/cinder.yaml
index 55c9442..a755adf 100644
--- a/zuul.d/container-images/cinder.yaml
+++ b/zuul.d/container-images/cinder.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-cinder
container_images:
- context: images/cinder
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/cinder
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/cinder
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/designate.yaml b/zuul.d/container-images/designate.yaml
index bfc3c6a..41be3a7 100644
--- a/zuul.d/container-images/designate.yaml
+++ b/zuul.d/container-images/designate.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-designate
container_images:
- context: images/designate
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/designate
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/designate
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/glance.yaml b/zuul.d/container-images/glance.yaml
index 6f92bed..f158d35 100644
--- a/zuul.d/container-images/glance.yaml
+++ b/zuul.d/container-images/glance.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-glance
container_images:
- context: images/glance
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/glance
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/glance
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/heat.yaml b/zuul.d/container-images/heat.yaml
index 5b4087e..4c2fd87 100644
--- a/zuul.d/container-images/heat.yaml
+++ b/zuul.d/container-images/heat.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-heat
container_images:
- context: images/heat
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/heat
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/heat
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/horizon.yaml b/zuul.d/container-images/horizon.yaml
index a9de5a2..d3a713e 100644
--- a/zuul.d/container-images/horizon.yaml
+++ b/zuul.d/container-images/horizon.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-horizon
container_images:
- context: images/horizon
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/horizon
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/horizon
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/ironic.yaml b/zuul.d/container-images/ironic.yaml
index 780a02c..18403e0 100644
--- a/zuul.d/container-images/ironic.yaml
+++ b/zuul.d/container-images/ironic.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-ironic
container_images:
- context: images/ironic
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/ironic
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/ironic
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/keepalived.yaml b/zuul.d/container-images/keepalived.yaml
index 81b18f0..e4f55ce 100644
--- a/zuul.d/container-images/keepalived.yaml
+++ b/zuul.d/container-images/keepalived.yaml
@@ -35,8 +35,8 @@
promote_container_image_job: atmosphere-upload-container-image-keepalived
container_images:
- context: images/keepalived
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/keepalived
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/keepalived
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/keystone.yaml b/zuul.d/container-images/keystone.yaml
index 74f04b2..d3bc1b7 100644
--- a/zuul.d/container-images/keystone.yaml
+++ b/zuul.d/container-images/keystone.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-keystone
container_images:
- context: images/keystone
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/keystone
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/keystone
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/kubernetes-entrypoint.yaml b/zuul.d/container-images/kubernetes-entrypoint.yaml
index b11ef16..03a2a39 100644
--- a/zuul.d/container-images/kubernetes-entrypoint.yaml
+++ b/zuul.d/container-images/kubernetes-entrypoint.yaml
@@ -33,8 +33,8 @@
promote_container_image_job: atmosphere-upload-container-image-kubernetes-entrypoint
container_images:
- context: images/kubernetes-entrypoint
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/kubernetes-entrypoint
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/kubernetes-entrypoint
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/libvirtd.yaml b/zuul.d/container-images/libvirtd.yaml
index 4fd0cef..f77f45e 100644
--- a/zuul.d/container-images/libvirtd.yaml
+++ b/zuul.d/container-images/libvirtd.yaml
@@ -39,8 +39,8 @@
promote_container_image_job: atmosphere-upload-container-image-libvirtd
container_images:
- context: images/libvirtd
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/libvirtd
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/libvirtd
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/magnum.yaml b/zuul.d/container-images/magnum.yaml
index bfa764e..2772c95 100644
--- a/zuul.d/container-images/magnum.yaml
+++ b/zuul.d/container-images/magnum.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-magnum
container_images:
- context: images/magnum
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/magnum
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/magnum
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/manila.yaml b/zuul.d/container-images/manila.yaml
index ad298ff..893f9fe 100644
--- a/zuul.d/container-images/manila.yaml
+++ b/zuul.d/container-images/manila.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-manila
container_images:
- context: images/manila
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/manila
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/manila
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/netoffload.yaml b/zuul.d/container-images/netoffload.yaml
index 50620c5..4e23e9e 100644
--- a/zuul.d/container-images/netoffload.yaml
+++ b/zuul.d/container-images/netoffload.yaml
@@ -35,8 +35,8 @@
promote_container_image_job: atmosphere-upload-container-image-netoffload
container_images:
- context: images/netoffload
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/netoffload
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/netoffload
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/neutron.yaml b/zuul.d/container-images/neutron.yaml
index 66ce8aa..54594fd 100644
--- a/zuul.d/container-images/neutron.yaml
+++ b/zuul.d/container-images/neutron.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-neutron
container_images:
- context: images/neutron
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/neutron
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/neutron
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/nova-ssh.yaml b/zuul.d/container-images/nova-ssh.yaml
index b38faf4..5d3e337 100644
--- a/zuul.d/container-images/nova-ssh.yaml
+++ b/zuul.d/container-images/nova-ssh.yaml
@@ -39,8 +39,8 @@
promote_container_image_job: atmosphere-upload-container-image-nova-ssh
container_images:
- context: images/nova-ssh
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/nova-ssh
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/nova-ssh
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/nova.yaml b/zuul.d/container-images/nova.yaml
index fcb1382..f377b8a 100644
--- a/zuul.d/container-images/nova.yaml
+++ b/zuul.d/container-images/nova.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-nova
container_images:
- context: images/nova
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/nova
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/nova
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/octavia.yaml b/zuul.d/container-images/octavia.yaml
index d7c74ac..7912168 100644
--- a/zuul.d/container-images/octavia.yaml
+++ b/zuul.d/container-images/octavia.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-octavia
container_images:
- context: images/octavia
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/octavia
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/octavia
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/openstack-python-runtime.yaml b/zuul.d/container-images/openstack-python-runtime.yaml
index c3bbe01..eaa403c 100644
--- a/zuul.d/container-images/openstack-python-runtime.yaml
+++ b/zuul.d/container-images/openstack-python-runtime.yaml
@@ -39,14 +39,14 @@
promote_container_image_job: atmosphere-upload-container-image-openstack-python-runtime
container_images:
- context: images/openstack-runtime
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/openstack-python-runtime
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/openstack-python-runtime
arch:
- linux/amd64
- linux/arm64
build_args:
- "RELEASE={{ zuul.branch | replace('stable/', '') }}"
- - "FROM=registry.atmosphere.dev/library/python-base:{{ zuul.branch | replace('stable/', '') }}"
+ - "FROM=harbor.atmosphere.dev/library/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 45036da..33f5298 100644
--- a/zuul.d/container-images/openstack-runtime.yaml
+++ b/zuul.d/container-images/openstack-runtime.yaml
@@ -37,8 +37,8 @@
promote_container_image_job: atmosphere-upload-container-image-openstack-runtime
container_images:
- context: images/openstack-runtime
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/openstack-runtime
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/openstack-runtime
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/openstack-venv-builder.yaml b/zuul.d/container-images/openstack-venv-builder.yaml
index e5dabfb..844d203 100644
--- a/zuul.d/container-images/openstack-venv-builder.yaml
+++ b/zuul.d/container-images/openstack-venv-builder.yaml
@@ -39,8 +39,8 @@
promote_container_image_job: atmosphere-upload-container-image-openstack-venv-builder
container_images:
- context: images/openstack-venv-builder
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/openstack-venv-builder
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/openstack-venv-builder
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/openvswitch.yaml b/zuul.d/container-images/openvswitch.yaml
index e2345e2..f11caec 100644
--- a/zuul.d/container-images/openvswitch.yaml
+++ b/zuul.d/container-images/openvswitch.yaml
@@ -33,8 +33,8 @@
promote_container_image_job: atmosphere-upload-container-image-openvswitch
container_images:
- context: images/openvswitch
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/openvswitch
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/openvswitch
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/ovn.yaml b/zuul.d/container-images/ovn.yaml
index e7735cb..83d4aca 100644
--- a/zuul.d/container-images/ovn.yaml
+++ b/zuul.d/container-images/ovn.yaml
@@ -35,8 +35,8 @@
promote_container_image_job: atmosphere-upload-container-image-ovn
container_images:
- context: images/ovn
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/ovn-central
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/ovn-central
arch:
- linux/amd64
build_args:
@@ -45,8 +45,8 @@
tags:
- "{{ zuul.branch | replace('stable/', '') }}"
- context: images/ovn
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/ovn-host
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/ovn-host
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/placement.yaml b/zuul.d/container-images/placement.yaml
index a3a024d..c892dc4 100644
--- a/zuul.d/container-images/placement.yaml
+++ b/zuul.d/container-images/placement.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-placement
container_images:
- context: images/placement
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/placement
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/placement
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/python-base.yaml b/zuul.d/container-images/python-base.yaml
index 5faec22..dae0fd3 100644
--- a/zuul.d/container-images/python-base.yaml
+++ b/zuul.d/container-images/python-base.yaml
@@ -37,8 +37,8 @@
promote_container_image_job: atmosphere-upload-container-image-python-base
container_images:
- context: images/python-base
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/python-base
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/python-base
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/python-openstackclient.yaml b/zuul.d/container-images/python-openstackclient.yaml
index f6c4566..f05b9b5 100644
--- a/zuul.d/container-images/python-openstackclient.yaml
+++ b/zuul.d/container-images/python-openstackclient.yaml
@@ -41,8 +41,8 @@
promote_container_image_job: atmosphere-upload-container-image-python-openstackclient
container_images:
- context: images/python-openstackclient
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/python-openstackclient
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/python-openstackclient
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/staffeln.yaml b/zuul.d/container-images/staffeln.yaml
index 7cecc39..30cb920 100644
--- a/zuul.d/container-images/staffeln.yaml
+++ b/zuul.d/container-images/staffeln.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-staffeln
container_images:
- context: images/staffeln
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/staffeln
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/staffeln
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/tempest.yaml b/zuul.d/container-images/tempest.yaml
index 1a979e2..ead0bdb 100644
--- a/zuul.d/container-images/tempest.yaml
+++ b/zuul.d/container-images/tempest.yaml
@@ -43,8 +43,8 @@
promote_container_image_job: atmosphere-upload-container-image-tempest
container_images:
- context: images/tempest
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/tempest
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/tempest
arch:
- linux/amd64
build_args:
diff --git a/zuul.d/container-images/ubuntu-cloud-archive.yaml b/zuul.d/container-images/ubuntu-cloud-archive.yaml
index f4a62ca..aab44f8 100644
--- a/zuul.d/container-images/ubuntu-cloud-archive.yaml
+++ b/zuul.d/container-images/ubuntu-cloud-archive.yaml
@@ -35,8 +35,8 @@
promote_container_image_job: atmosphere-upload-container-image-ubuntu-cloud-archive
container_images:
- context: images/ubuntu-cloud-archive
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/ubuntu-cloud-archive
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/ubuntu-cloud-archive
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/container-images/ubuntu.yaml b/zuul.d/container-images/ubuntu.yaml
index 86d7363..6c90f69 100644
--- a/zuul.d/container-images/ubuntu.yaml
+++ b/zuul.d/container-images/ubuntu.yaml
@@ -33,8 +33,8 @@
promote_container_image_job: atmosphere-upload-container-image-ubuntu
container_images:
- context: images/ubuntu
- registry: registry.atmosphere.dev
- repository: registry.atmosphere.dev/library/ubuntu
+ registry: harbor.atmosphere.dev
+ repository: harbor.atmosphere.dev/library/ubuntu
arch:
- linux/amd64
- linux/arm64
diff --git a/zuul.d/playbooks/common/switch-to-atmosphere-mirror.yml b/zuul.d/playbooks/common/switch-to-atmosphere-mirror.yml
index c925321..839841b 100644
--- a/zuul.d/playbooks/common/switch-to-atmosphere-mirror.yml
+++ b/zuul.d/playbooks/common/switch-to-atmosphere-mirror.yml
@@ -1,10 +1,16 @@
- name: Switch to Atmosphere image mirror
hosts: all
tasks:
+ - name: Switch all images out of the CDN
+ ansible.builtin.replace:
+ path: "{{ zuul.project.src_dir }}/roles/defaults/vars/main.yml"
+ regexp: 'registry.atmosphere.dev'
+ replace: 'harbor.atmosphere.dev'
+
# TODO(mnaser): Drop this when we can use https://github.com/vexxhost/atmosphere/pull/977
- name: Prefix all images for the job to point to mirror
ansible.builtin.shell: |
- sed -i '/registry.atmosphere.dev/!s/ \(.*\): \(.*\)$/ \1: registry.atmosphere.dev\/\2/' roles/defaults/vars/main.yml
+ sed -i '/harbor.atmosphere.dev/!s/ \(.*\): \(.*\)$/ \1: harbor.atmosphere.dev\/\2/' roles/defaults/vars/main.yml
args:
chdir: "{{ zuul.project.src_dir }}"
diff --git a/zuul.d/secrets.yaml b/zuul.d/secrets.yaml
index 0c59229..b9ed603 100644
--- a/zuul.d/secrets.yaml
+++ b/zuul.d/secrets.yaml
@@ -13,9 +13,9 @@
# under the License.
- secret:
- name: atmosphere-registry-credentials
+ name: atmosphere-harbor-credentials
data:
- registry.atmosphere.dev:
+ harbor.atmosphere.dev:
username: robot$zuul
password: !encrypted/pkcs1-oaep
- OOykjodZE21qsYYLpzplp+PV0QbsKQ1B3+kI7bY97VQI/d5RlewqlNABc10eQnyYFSDvq