gophercloud · kayrus · May 13, 2025 · Apr 18, 2025 · Apr 18, 2025
diff --git a/.github/workflows/functional-baremetal.yaml b/.github/workflows/functional-baremetal.yaml
@@ -14,25 +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: ""
-          - 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
@@ -98,8 +87,7 @@ jobs:
           DEVSTACK_PATH: ${{ github.workspace }}/devstack
           PACKAGE: "./internal/acceptance/openstack/baremetal/..."
           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()

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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: