Simplify functional-baremetal jobs

stephenfin · web-flow · commit 5a00cd21f46a · 2025-05-13T16:22:40.000Z
All versions use system scope now.

Signed-off-by: Stephen Finucane &lt;stephenfin@redhat.com&gt;
diff --git 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
@@ -93,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()
