From 6f3995e95232d563bb0a8eec80fd48d009b5947e Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Thu, 4 Dec 2025 11:42:16 +0100 Subject: [PATCH 1/2] 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]. Disable SLURP upgrade jobs temporarily until 2024.1 is fixed following its move to unmaintained status. [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 (cherry picked from commit 88f30f24ad40c3dff5e02030931755c5c99e863b) --- playbooks/kayobe-overcloud-base/overrides.yml.j2 | 3 --- .../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 --- zuul.d/project.yaml | 12 ++++++------ 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/playbooks/kayobe-overcloud-base/overrides.yml.j2 b/playbooks/kayobe-overcloud-base/overrides.yml.j2 index c13f16f1a..33e28d855 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 4ac75a54c..d1f4d781b 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 2c4c6213f..523c71abb 100644 --- a/playbooks/kayobe-seed-base/overrides.yml.j2 +++ b/playbooks/kayobe-seed-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" # 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 }}" diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 741899b51..96c5af2dd 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -27,15 +27,15 @@ - kayobe-overcloud-ubuntu-noble - kayobe-overcloud-ubuntu-noble-podman - kayobe-overcloud-upgrade-rocky9 - - kayobe-overcloud-upgrade-slurp-rocky9 - - kayobe-overcloud-upgrade-slurp-ubuntu-noble + #- kayobe-overcloud-upgrade-slurp-rocky9 + #- kayobe-overcloud-upgrade-slurp-ubuntu-noble - kayobe-overcloud-upgrade-ubuntu-noble - kayobe-seed-rocky9 - kayobe-seed-rocky9-podman - kayobe-seed-ubuntu-noble - kayobe-seed-ubuntu-noble-podman - kayobe-seed-upgrade-rocky9 - - kayobe-seed-upgrade-slurp-rocky9 + #- kayobe-seed-upgrade-slurp-rocky9 - kayobe-seed-upgrade-ubuntu-noble - kayobe-seed-vm-rocky10 - kayobe-seed-vm-rocky9 @@ -61,15 +61,15 @@ - kayobe-overcloud-ubuntu-noble - kayobe-overcloud-ubuntu-noble-podman - kayobe-overcloud-upgrade-rocky9 - - kayobe-overcloud-upgrade-slurp-rocky9 - - kayobe-overcloud-upgrade-slurp-ubuntu-noble + #- kayobe-overcloud-upgrade-slurp-rocky9 + #- kayobe-overcloud-upgrade-slurp-ubuntu-noble - kayobe-overcloud-upgrade-ubuntu-noble - kayobe-seed-rocky9 - kayobe-seed-rocky9-podman - kayobe-seed-ubuntu-noble - kayobe-seed-ubuntu-noble-podman - kayobe-seed-upgrade-rocky9 - - kayobe-seed-upgrade-slurp-rocky9 + #- kayobe-seed-upgrade-slurp-rocky9 - kayobe-seed-upgrade-ubuntu-noble - kayobe-seed-vm-rocky10 - kayobe-seed-vm-rocky9 From ec431df188cfc721d54be3871997b724084347b7 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Fri, 5 Dec 2025 12:26:52 +0100 Subject: [PATCH 2/2] CI: Fix SLURP upgrades due to 2024.1 branch renaming The stable/2024.1 branch was renamed to unmaintained/2024.1. Change-Id: Ibb3a9089d3e619d2cf9f0fa6e1d4bb16727ec17e Signed-off-by: Pierre Riteau --- playbooks/kayobe-base/pre.yml | 14 ++++++++------ zuul.d/project.yaml | 12 ++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/playbooks/kayobe-base/pre.yml b/playbooks/kayobe-base/pre.yml index 34a317a0e..2f9232e34 100644 --- a/playbooks/kayobe-base/pre.yml +++ b/playbooks/kayobe-base/pre.yml @@ -131,7 +131,9 @@ src: overrides.yml.j2 dest: "{{ kayobe_config_src_dir }}/etc/kayobe/zz-10-overrides.yml" - - block: + - vars: + branch_prefix: "{{ 'unmaintained' if previous_release | lower == '2024.1' else 'stable' }}" + block: - name: Ensure previous kayobe directory exists file: path: "{{ previous_kayobe_src_dir }}" @@ -139,7 +141,7 @@ - name: Ensure previous kayobe repository is cloned command: >- - git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }} + git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }} - name: Ensure previous kayobe-config directory exists file: @@ -148,7 +150,7 @@ - name: Ensure kayobe-config repository is cloned command: >- - git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }} + git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }} - name: Ensure previous kolla-ansible directory exists file: @@ -157,7 +159,7 @@ - name: Ensure previous kolla-ansible repository is cloned command: >- - git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b stable/{{ previous_release | lower }} + git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b {{ branch_prefix }}/{{ previous_release | lower }} - name: Ensure previous kayobe is executed in verbose mode lineinfile: @@ -180,14 +182,14 @@ name: kayobe-galaxy-requirements vars: kayobe_galaxy_requirements_src_dir: "{{ previous_kayobe_src_dir }}" - kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}" + kayobe_galaxy_requirements_branch: "{{ branch_prefix }}/{{ previous_release | lower }}" - name: Update kolla-ansible requirements.yml include_role: name: kayobe-galaxy-requirements vars: kayobe_galaxy_requirements_src_dir: "{{ previous_kolla_ansible_src_dir }}" - kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}" + kayobe_galaxy_requirements_branch: "{{ branch_prefix }}/{{ previous_release | lower }}" kayobe_galaxy_requirements_dest_path: "/tmp/previous-kolla-ansible-requirements.yml" when: is_upgrade diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 96c5af2dd..741899b51 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -27,15 +27,15 @@ - kayobe-overcloud-ubuntu-noble - kayobe-overcloud-ubuntu-noble-podman - kayobe-overcloud-upgrade-rocky9 - #- kayobe-overcloud-upgrade-slurp-rocky9 - #- kayobe-overcloud-upgrade-slurp-ubuntu-noble + - kayobe-overcloud-upgrade-slurp-rocky9 + - kayobe-overcloud-upgrade-slurp-ubuntu-noble - kayobe-overcloud-upgrade-ubuntu-noble - kayobe-seed-rocky9 - kayobe-seed-rocky9-podman - kayobe-seed-ubuntu-noble - kayobe-seed-ubuntu-noble-podman - kayobe-seed-upgrade-rocky9 - #- kayobe-seed-upgrade-slurp-rocky9 + - kayobe-seed-upgrade-slurp-rocky9 - kayobe-seed-upgrade-ubuntu-noble - kayobe-seed-vm-rocky10 - kayobe-seed-vm-rocky9 @@ -61,15 +61,15 @@ - kayobe-overcloud-ubuntu-noble - kayobe-overcloud-ubuntu-noble-podman - kayobe-overcloud-upgrade-rocky9 - #- kayobe-overcloud-upgrade-slurp-rocky9 - #- kayobe-overcloud-upgrade-slurp-ubuntu-noble + - kayobe-overcloud-upgrade-slurp-rocky9 + - kayobe-overcloud-upgrade-slurp-ubuntu-noble - kayobe-overcloud-upgrade-ubuntu-noble - kayobe-seed-rocky9 - kayobe-seed-rocky9-podman - kayobe-seed-ubuntu-noble - kayobe-seed-ubuntu-noble-podman - kayobe-seed-upgrade-rocky9 - #- kayobe-seed-upgrade-slurp-rocky9 + - kayobe-seed-upgrade-slurp-rocky9 - kayobe-seed-upgrade-ubuntu-noble - kayobe-seed-vm-rocky10 - kayobe-seed-vm-rocky9