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 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: - ^\..+ 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