From 1514ebc12354f09ff7514283d9115f83f01c9b47 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 18 Apr 2025 11:10:44 +0100 Subject: [PATCH 1/2] Drop CI coverage for Bobcat Bobcat enters the unmaintained [1] phase on 2025-04-30. We can no longer rely on this for testing. [1] https://docs.openstack.org/project-team-guide/stable-branches.html#unmaintained Signed-off-by: Stephen Finucane --- .github/workflows/functional-baremetal.yaml | 5 ----- .github/workflows/functional-basic.yaml | 4 ---- .github/workflows/functional-blockstorage.yaml | 4 ---- .github/workflows/functional-compute.yaml | 4 ---- .github/workflows/functional-containerinfra.yaml | 7 ------- .github/workflows/functional-dns.yaml | 4 ---- .github/workflows/functional-fwaas_v2.yaml | 4 ---- .github/workflows/functional-identity.yaml | 4 ---- .github/workflows/functional-image.yaml | 4 ---- .github/workflows/functional-keymanager.yaml | 4 ---- .github/workflows/functional-loadbalancer.yaml | 4 ---- .github/workflows/functional-messaging.yaml | 4 ---- .github/workflows/functional-networking.yaml | 4 ---- .github/workflows/functional-objectstorage.yaml | 4 ---- .github/workflows/functional-orchestration.yaml | 4 ---- .github/workflows/functional-placement.yaml | 4 ---- .github/workflows/functional-sharedfilesystems.yaml | 4 ---- .github/workflows/functional-workflow.yaml | 8 -------- 18 files changed, 80 deletions(-) diff --git a/.github/workflows/functional-baremetal.yaml b/.github/workflows/functional-baremetal.yaml index 0fd1b23911..444bc522d2 100644 --- a/.github/workflows/functional-baremetal.yaml +++ b/.github/workflows/functional-baremetal.yaml @@ -29,11 +29,6 @@ jobs: ubuntu_version: "22.04" use_system_scope: true additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - use_system_scope: false - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Ironic and run baremetal acceptance tests steps: diff --git a/.github/workflows/functional-basic.yaml b/.github/workflows/functional-basic.yaml index e4e35e15a3..2075f8748b 100644 --- a/.github/workflows/functional-basic.yaml +++ b/.github/workflows/functional-basic.yaml @@ -26,10 +26,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with defaults and run basic acceptance tests steps: diff --git a/.github/workflows/functional-blockstorage.yaml b/.github/workflows/functional-blockstorage.yaml index 1e1cfefd96..ae954685de 100644 --- a/.github/workflows/functional-blockstorage.yaml +++ b/.github/workflows/functional-blockstorage.yaml @@ -23,10 +23,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Cinder and run blockstorage acceptance tests steps: diff --git a/.github/workflows/functional-compute.yaml b/.github/workflows/functional-compute.yaml index caf7ce117c..246ced0e66 100644 --- a/.github/workflows/functional-compute.yaml +++ b/.github/workflows/functional-compute.yaml @@ -23,10 +23,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Nova and run compute acceptance tests steps: diff --git a/.github/workflows/functional-containerinfra.yaml b/.github/workflows/functional-containerinfra.yaml index 15c4b24169..fa5603dbf4 100644 --- a/.github/workflows/functional-containerinfra.yaml +++ b/.github/workflows/functional-containerinfra.yaml @@ -38,13 +38,6 @@ jobs: enable_plugin magnum https://github.com/openstack/magnum stable/2024.1 MAGNUMCLIENT_BRANCH=stable/2024.1 additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - devstack_conf_overrides: | - enable_plugin magnum https://github.com/openstack/magnum stable/2023.2 - MAGNUMCLIENT_BRANCH=stable/2023.2 - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Magnum and run containerinfra acceptance tests steps: diff --git a/.github/workflows/functional-dns.yaml b/.github/workflows/functional-dns.yaml index 9795797ece..00ba96b797 100644 --- a/.github/workflows/functional-dns.yaml +++ b/.github/workflows/functional-dns.yaml @@ -30,10 +30,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Designate and run dns acceptance tests steps: diff --git a/.github/workflows/functional-fwaas_v2.yaml b/.github/workflows/functional-fwaas_v2.yaml index fe4a47f1c4..107bea8d5d 100644 --- a/.github/workflows/functional-fwaas_v2.yaml +++ b/.github/workflows/functional-fwaas_v2.yaml @@ -23,10 +23,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with enabled FWaaS_v2 and run networking acceptance tests steps: diff --git a/.github/workflows/functional-identity.yaml b/.github/workflows/functional-identity.yaml index 49dbb67388..707eb42701 100644 --- a/.github/workflows/functional-identity.yaml +++ b/.github/workflows/functional-identity.yaml @@ -23,10 +23,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Keystone and run identity acceptance tests steps: diff --git a/.github/workflows/functional-image.yaml b/.github/workflows/functional-image.yaml index 32af7ac67a..357d2cdd66 100644 --- a/.github/workflows/functional-image.yaml +++ b/.github/workflows/functional-image.yaml @@ -23,10 +23,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Glance and run image acceptance tests steps: diff --git a/.github/workflows/functional-keymanager.yaml b/.github/workflows/functional-keymanager.yaml index ec58ffbeb6..cb2d4d6459 100644 --- a/.github/workflows/functional-keymanager.yaml +++ b/.github/workflows/functional-keymanager.yaml @@ -29,10 +29,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Barbican and run keymanager acceptance tests steps: diff --git a/.github/workflows/functional-loadbalancer.yaml b/.github/workflows/functional-loadbalancer.yaml index f2c61c5d2c..0b3883aa47 100644 --- a/.github/workflows/functional-loadbalancer.yaml +++ b/.github/workflows/functional-loadbalancer.yaml @@ -29,10 +29,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Octavia and run loadbalancer acceptance tests steps: diff --git a/.github/workflows/functional-messaging.yaml b/.github/workflows/functional-messaging.yaml index a002dc0841..c0ac8563f2 100644 --- a/.github/workflows/functional-messaging.yaml +++ b/.github/workflows/functional-messaging.yaml @@ -23,10 +23,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Zaqar and run messaging acceptance tests steps: diff --git a/.github/workflows/functional-networking.yaml b/.github/workflows/functional-networking.yaml index 7800c7d8ff..798f7e61e6 100644 --- a/.github/workflows/functional-networking.yaml +++ b/.github/workflows/functional-networking.yaml @@ -23,10 +23,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Neutron and run networking acceptance tests steps: diff --git a/.github/workflows/functional-objectstorage.yaml b/.github/workflows/functional-objectstorage.yaml index 6095701b48..98da4e3696 100644 --- a/.github/workflows/functional-objectstorage.yaml +++ b/.github/workflows/functional-objectstorage.yaml @@ -23,10 +23,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Swift and run objectstorage acceptance tests steps: diff --git a/.github/workflows/functional-orchestration.yaml b/.github/workflows/functional-orchestration.yaml index 05f2fc0135..9256ed9838 100644 --- a/.github/workflows/functional-orchestration.yaml +++ b/.github/workflows/functional-orchestration.yaml @@ -23,10 +23,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Heat and run orchestration acceptance tests steps: diff --git a/.github/workflows/functional-placement.yaml b/.github/workflows/functional-placement.yaml index a0fdb33fa0..819c2b3968 100644 --- a/.github/workflows/functional-placement.yaml +++ b/.github/workflows/functional-placement.yaml @@ -23,10 +23,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Placement and run placement acceptance tests steps: diff --git a/.github/workflows/functional-sharedfilesystems.yaml b/.github/workflows/functional-sharedfilesystems.yaml index 8f5deb116d..4f9a11a3a4 100644 --- a/.github/workflows/functional-sharedfilesystems.yaml +++ b/.github/workflows/functional-sharedfilesystems.yaml @@ -29,10 +29,6 @@ jobs: openstack_version: "stable/2024.1" ubuntu_version: "22.04" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Manila and run sharedfilesystems acceptance tests steps: diff --git a/.github/workflows/functional-workflow.yaml b/.github/workflows/functional-workflow.yaml index 7cb15ec88a..6d14e61d5a 100644 --- a/.github/workflows/functional-workflow.yaml +++ b/.github/workflows/functional-workflow.yaml @@ -26,14 +26,6 @@ jobs: ubuntu_version: "22.04" mistral_plugin_version: "stable/2024.1" additional_services: "" - - name: "bobcat" - openstack_version: "stable/2023.2" - ubuntu_version: "22.04" - # Devstack support is broken with Mistral v2023.2, and requires 2 patches: - # * https://github.com/openstack/mistral/commit/e343ccb078d8ba261ac70afca93f4358589730d3 - # * https://github.com/openstack/mistral/commit/ecdeadeb7a1aa87cba2cdb0c1a2bb1ffc4aabf25 - mistral_plugin_version: "ecdeadeb7a1aa87cba2cdb0c1a2bb1ffc4aabf25" - additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Mistral and run workflow acceptance tests steps: From f9e0418f47bf4f9f5687be0d6dfc119ac2c0898c Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 18 Apr 2025 11:11:57 +0100 Subject: [PATCH 2/2] Simplify functional-baremetal jobs All versions use system scope now. Signed-off-by: Stephen Finucane --- .github/workflows/functional-baremetal.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/functional-baremetal.yaml b/.github/workflows/functional-baremetal.yaml index 444bc522d2..2f4f860fb2 100644 --- a/.github/workflows/functional-baremetal.yaml +++ b/.github/workflows/functional-baremetal.yaml @@ -14,20 +14,14 @@ jobs: - name: "master" openstack_version: "master" ubuntu_version: "22.04" - use_system_scope: true additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" - # NOTE(dtantsur): this forces running tests with a system scope - # token, which is required for certain actions. Use it on versions - # starting with 2024.1. - use_system_scope: true additional_services: "openstack-cli-server" - name: "caracal" openstack_version: "stable/2024.1" ubuntu_version: "22.04" - use_system_scope: true additional_services: "" runs-on: ubuntu-${{ matrix.ubuntu_version }} name: Deploy OpenStack ${{ matrix.name }} with Ironic and run baremetal acceptance tests @@ -86,8 +80,7 @@ jobs: env: DEVSTACK_PATH: ${{ github.workspace }}/devstack OS_BRANCH: ${{ matrix.openstack_version }} - # TODO(dtantsur): default to true when no longer supporting versions before 2024.1 - USE_SYSTEM_SCOPE: ${{ matrix.use_system_scope }} + USE_SYSTEM_SCOPE: true - name: Generate logs on failure run: ./script/collectlogs if: failure()