From f58ee9473d711397d75ab54d74edc67d625dc0f5 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Mon, 24 Nov 2025 16:14:00 +0000 Subject: [PATCH 1/3] Update .gitreview for unmaintained/2024.1 Change-Id: Iacc298910a4d5aa19ba6be35e0614967f4103291 Signed-off-by: OpenStack Release Bot Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/functions --- .gitreview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitreview b/.gitreview index b46fcc55b..e82a64170 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=review.opendev.org port=29418 project=openstack/kayobe.git -defaultbranch=stable/2024.1 +defaultbranch=unmaintained/2024.1 From 06779b37b0f77360ff9ebde2e72c553d98f48faa Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 25 Nov 2025 09:30:58 +0100 Subject: [PATCH 2/3] CI: Remove upgrade jobs following 2023.1 Antelope EOL The unmaintained/2023.1 branch was deleted with the end of life of the 2023.1 Antelope release [1], which will cause upgrade jobs to fail. [1] https://review.opendev.org/c/openstack/releases/+/967217 Change-Id: I4f6af042eb38d98429075d845b2a1c9ecebebf88 Signed-off-by: Pierre Riteau --- zuul.d/project.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index b36da11de..14a2b1951 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -19,15 +19,9 @@ - kayobe-overcloud-host-configure-centos9s - kayobe-overcloud-host-configure-ubuntu-jammy - kayobe-overcloud-host-configure-ubuntu-noble - - kayobe-overcloud-upgrade-slurp-rocky9: - voting: false - - kayobe-overcloud-upgrade-slurp-ubuntu-jammy: - voting: false - kayobe-seed-rocky9 - kayobe-seed-ubuntu-jammy - kayobe-seed-ubuntu-noble - - kayobe-seed-upgrade-slurp-rocky9 - - kayobe-seed-upgrade-slurp-ubuntu-jammy - kayobe-seed-vm-rocky9 - kayobe-seed-vm-rocky9-efi - kayobe-seed-vm-ubuntu-jammy @@ -56,8 +50,6 @@ - kayobe-seed-rocky9 - kayobe-seed-ubuntu-jammy - kayobe-seed-ubuntu-noble - - kayobe-seed-upgrade-slurp-rocky9 - - kayobe-seed-upgrade-slurp-ubuntu-jammy - kayobe-seed-vm-rocky9 - kayobe-seed-vm-ubuntu-jammy - kayobe-seed-vm-ubuntu-noble From 74568bda88cc30a1ea4804eb6f04443aba0d3a72 Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 25 Nov 2025 09:44:36 +0100 Subject: [PATCH 3/3] Rename stable/2024.1 to unmaintained/2024.1 The 2024.1 Caracal release has transitioned to unmaintained [1]. [1] https://review.opendev.org/c/openstack/releases/+/967694 Change-Id: I12e8b5b29d437f379300f761334e143f44637e6d Signed-off-by: Pierre Riteau --- ansible/inventory/group_vars/all/openstack | 4 ++-- etc/kayobe/openstack.yml | 2 +- requirements.yml | 2 +- zuul.d/jobs.yaml | 8 -------- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/ansible/inventory/group_vars/all/openstack b/ansible/inventory/group_vars/all/openstack index 45faf9385..a454bacad 100644 --- a/ansible/inventory/group_vars/all/openstack +++ b/ansible/inventory/group_vars/all/openstack @@ -5,9 +5,9 @@ # Name of the current OpenStack release. Default is "2024.1". openstack_release: "2024.1" -# Name of the current OpenStack branch. Default is "stable/2024.1". +# Name of the current OpenStack branch. Default is "unmaintained/2024.1". openstack_branch: >- - {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }} + {% if openstack_release != 'master' %}unmaintained/{% endif %}{{ openstack_release | lower }} ############################################################################### # OpenStack authentication configuration. diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml index 4db759fc7..9800a9a3b 100644 --- a/etc/kayobe/openstack.yml +++ b/etc/kayobe/openstack.yml @@ -5,7 +5,7 @@ # Name of the current OpenStack release. Default is "2024.1". #openstack_release: -# Name of the current OpenStack branch. Default is "stable/2024.1". +# Name of the current OpenStack branch. Default is "unmaintained/2024.1". #openstack_branch: ############################################################################### diff --git a/requirements.yml b/requirements.yml index 2119cd489..611fc0959 100644 --- a/requirements.yml +++ b/requirements.yml @@ -2,7 +2,7 @@ collections: - name: https://opendev.org/openstack/ansible-collection-kolla type: git - version: stable/2024.1 + version: unmaintained/2024.1 - name: dellemc.os10 version: 1.1.1 - name: openstack.cloud diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 5f670c722..52c289405 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -71,19 +71,11 @@ required-projects: # Include kayobe to ensure other projects can use this job. - name: openstack/ansible-collection-kolla - # TODO(priteau): Remove when kayobe stable/2024.1 exists. - override-checkout: stable/2024.1 - name: openstack/kayobe - name: openstack/kayobe-config-dev - name: openstack/kolla - # TODO(priteau): Remove when kayobe stable/2024.1 exists. - override-checkout: stable/2024.1 - name: openstack/kolla-ansible - # TODO(priteau): Remove when kayobe stable/2024.1 exists. - override-checkout: stable/2024.1 - name: openstack/requirements - # TODO(priteau): Remove when kayobe stable/2024.1 exists. - override-checkout: stable/2024.1 - name: openstack/tenks irrelevant-files: - ^\..+