From 39679473e1ca187e3a3a27e75d51daec7b85dd61 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 8 Apr 2026 12:08:31 +0100 Subject: [PATCH 1/5] ci: Drop flamingo, master 22.04 jobs Neither Flamingo (2025.2) [1] nor master (future 2026.2) [2] support Ubuntu 22.04. Drop these jobs. [1] https://governance.openstack.org/tc/reference/runtimes/2025.2.html [2] https://governance.openstack.org/tc/reference/runtimes/2026.2.html Signed-off-by: Stephen Finucane --- .github/workflows/with-defaults.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.github/workflows/with-defaults.yml b/.github/workflows/with-defaults.yml index 472480d..5ce0370 100644 --- a/.github/workflows/with-defaults.yml +++ b/.github/workflows/with-defaults.yml @@ -13,18 +13,10 @@ jobs: openstack_version: ["master"] ubuntu_version: ["22.04"] include: - - name: "master-22.04" - openstack_version: "master" - ubuntu_version: "22.04" - additional_services: "openstack-cli-server" - name: "master-24.04" openstack_version: "master" ubuntu_version: "24.04" additional_services: "openstack-cli-server" - - name: "flamingo-22.04" - openstack_version: "stable/2025.2" - ubuntu_version: "22.04" - additional_services: "" - name: "flamingo-24.04" openstack_version: "stable/2025.2" ubuntu_version: "24.04" From 693102b259bcc2c76569cc932387981348f6f854 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 8 Apr 2026 12:09:44 +0100 Subject: [PATCH 2/5] ci: Drop caracal testing It is unmaintained [1]. [1] https://releases.openstack.org/ Signed-off-by: Stephen Finucane --- .github/workflows/with-defaults.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/with-defaults.yml b/.github/workflows/with-defaults.yml index 5ce0370..9d343fa 100644 --- a/.github/workflows/with-defaults.yml +++ b/.github/workflows/with-defaults.yml @@ -37,10 +37,6 @@ jobs: openstack_version: "stable/2024.2" ubuntu_version: "24.04" additional_services: "openstack-cli-server" - - name: "caracal-22.04" - openstack_version: "stable/2024.1" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: A job to deploy devstack with defaults steps: From fc9df801c07c47bef4becb18ef050138cfc78d6a Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 8 Apr 2026 12:11:32 +0100 Subject: [PATCH 3/5] ci: Always enable openstack-cli-server Every supported version of DevStack now supports this feature. Signed-off-by: Stephen Finucane --- .github/workflows/with-defaults.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/with-defaults.yml b/.github/workflows/with-defaults.yml index 9d343fa..0074081 100644 --- a/.github/workflows/with-defaults.yml +++ b/.github/workflows/with-defaults.yml @@ -16,27 +16,21 @@ jobs: - name: "master-24.04" openstack_version: "master" ubuntu_version: "24.04" - additional_services: "openstack-cli-server" - name: "flamingo-24.04" openstack_version: "stable/2025.2" ubuntu_version: "24.04" - additional_services: "" - name: "epoxy-22.04" openstack_version: "stable/2025.1" ubuntu_version: "22.04" - additional_services: "" - name: "epoxy-24.04" openstack_version: "stable/2025.1" ubuntu_version: "24.04" - additional_services: "" - name: "dalmatian-22.04" openstack_version: "stable/2024.2" ubuntu_version: "22.04" - additional_services: "openstack-cli-server" - name: "dalmatian-24.04" openstack_version: "stable/2024.2" ubuntu_version: "24.04" - additional_services: "openstack-cli-server" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: A job to deploy devstack with defaults steps: @@ -46,7 +40,7 @@ jobs: uses: ./ with: branch: ${{ matrix.openstack_version }} - enabled_services: '${{ matrix.additional_services }}' + enabled_services: 'openstack-cli-server' - name: Upload logs artifacts on failure if: failure() uses: actions/upload-artifact@v4 From 5482112c62fb5d036683313a6c3a2ebe1109c944 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 8 Apr 2026 12:13:59 +0100 Subject: [PATCH 4/5] ci: Add gazpacho testing Signed-off-by: Stephen Finucane --- .github/workflows/with-defaults.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/with-defaults.yml b/.github/workflows/with-defaults.yml index 0074081..ae6fefe 100644 --- a/.github/workflows/with-defaults.yml +++ b/.github/workflows/with-defaults.yml @@ -16,6 +16,9 @@ jobs: - name: "master-24.04" openstack_version: "master" ubuntu_version: "24.04" + - name: "gazpacho-24.04" + openstack_version: "stable/2026.1" + ubuntu_version: "24.04" - name: "flamingo-24.04" openstack_version: "stable/2025.2" ubuntu_version: "24.04" From 6c5dfe4e0b34732ed4e8c39abfc9de56aa25f6b3 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 8 Apr 2026 12:29:44 +0100 Subject: [PATCH 5/5] ci: Simplify job matrix Remove some unnecessary suffixes where there is only one supported distro, and order things consistently from newest configuration to oldest. Signed-off-by: Stephen Finucane --- .github/workflows/with-defaults.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/with-defaults.yml b/.github/workflows/with-defaults.yml index ae6fefe..af34832 100644 --- a/.github/workflows/with-defaults.yml +++ b/.github/workflows/with-defaults.yml @@ -11,29 +11,26 @@ jobs: matrix: name: ["master"] openstack_version: ["master"] - ubuntu_version: ["22.04"] + ubuntu_version: ["24.04"] include: - - name: "master-24.04" - openstack_version: "master" - ubuntu_version: "24.04" - - name: "gazpacho-24.04" + - name: "gazpacho" openstack_version: "stable/2026.1" ubuntu_version: "24.04" - - name: "flamingo-24.04" + - name: "flamingo" openstack_version: "stable/2025.2" ubuntu_version: "24.04" - - name: "epoxy-22.04" - openstack_version: "stable/2025.1" - ubuntu_version: "22.04" - name: "epoxy-24.04" openstack_version: "stable/2025.1" ubuntu_version: "24.04" - - name: "dalmatian-22.04" - openstack_version: "stable/2024.2" + - name: "epoxy-22.04" + openstack_version: "stable/2025.1" ubuntu_version: "22.04" - name: "dalmatian-24.04" openstack_version: "stable/2024.2" ubuntu_version: "24.04" + - name: "dalmatian-22.04" + openstack_version: "stable/2024.2" + ubuntu_version: "22.04" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: A job to deploy devstack with defaults steps: