From 88f30f24ad40c3dff5e02030931755c5c99e863b Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 4 Dec 2025 11:42:16 +0100 Subject: [PATCH] CI: Stop using infra cache servers as registry We are seeing frequent CI job failures due to timeouts while fetching container images. See similar change in kolla-ansible [1]. Also remove the kolla_docker_namespace variable from CI overrides: "openstack.kolla" has been the default value since 2021 [2]. [1] https://review.opendev.org/c/openstack/kolla-ansible/+/967159 [2] https://review.opendev.org/c/openstack/kayobe/+/812947 Change-Id: I27ba36000d4f5842f27fc49230314fd54e434dcb Signed-off-by: Pierre Riteau --- playbooks/kayobe-overcloud-base/overrides.yml.j2 | 3 --- playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 | 3 --- playbooks/kayobe-seed-base/overrides.yml.j2 | 3 --- playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 | 3 --- 4 files changed, 12 deletions(-) diff --git a/playbooks/kayobe-overcloud-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-base/overrides.yml.j2 index 8f1a2bbec..16f94d9c2 100644 --- a/playbooks/kayobe-overcloud-base/overrides.yml.j2 +++ b/playbooks/kayobe-overcloud-base/overrides.yml.j2 @@ -4,9 +4,6 @@ docker_daemon_debug: true docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/" -kolla_docker_namespace: "openstack.kolla" -# use the published images from a site mirror of quay.io -kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447" kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}" kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}" kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}" diff --git a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 index 1170a5ed9..dc8fdb04f 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 +++ b/playbooks/kayobe-overcloud-upgrade-base/overrides.yml.j2 @@ -4,9 +4,6 @@ docker_daemon_debug: true docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/" -kolla_docker_namespace: "openstack.kolla" -# use the published images from a site mirror of quay.io -kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447" {% if not is_previous_release | default(false) %} kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}" kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}" diff --git a/playbooks/kayobe-seed-base/overrides.yml.j2 b/playbooks/kayobe-seed-base/overrides.yml.j2 index 8f4987390..9cfad25f8 100644 --- a/playbooks/kayobe-seed-base/overrides.yml.j2 +++ b/playbooks/kayobe-seed-base/overrides.yml.j2 @@ -15,9 +15,6 @@ docker_registry_image_full: "quay.io/libpod/registry:2.8.2" docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/" -kolla_docker_namespace: "openstack.kolla" -# use the published images from a site mirror of quay.io -kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447" # NOTE(mgoddard): The kolla repository is copied to /tmp/kolla and made # readable by the stack user. kolla_source_url: "/tmp/kolla" diff --git a/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 b/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 index 49d493862..11797e695 100644 --- a/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 +++ b/playbooks/kayobe-seed-upgrade-base/overrides.yml.j2 @@ -6,9 +6,6 @@ docker_registry_image_full: "quay.io/libpod/registry:2.8.2" docker_registry_mirrors: - "http://{{ zuul_site_mirror_fqdn }}:8082/" -kolla_docker_namespace: "openstack.kolla" -# use the published images from a site mirror of quay.io -kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447" {% if not is_previous_release | default(false) %} kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}" kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"