Skip to content

Synchronise 2024.1 with upstream #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
priteau merged 3 commits into from
Dec 2, 2025
Merged

Synchronise 2024.1 with upstream #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f58ee94
Update .gitreview for unmaintained/2024.1
openstackadmin Nov 24, 2025
06779b3
CI: Remove upgrade jobs following 2023.1 Antelope EOL
priteau Nov 25, 2025
74568bd
Rename stable/2024.1 to unmaintained/2024.1
priteau Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitreview
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
host=review.opendev.org
port=29418
project=openstack/kayobe.git
defaultbranch=stable/2024.1
defaultbranch=unmaintained/2024.1
4 changes: 2 additions & 2 deletions ansible/inventory/group_vars/all/openstack
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion etc/kayobe/openstack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

###############################################################################
Expand Down
2 changes: 1 addition & 1 deletion requirements.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions zuul.d/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
- ^\..+
Expand Down
8 changes: 0 additions & 8 deletions zuul.d/project.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down