Skip to content

Commit 7177265

Browse files
kayruskayrus
authored
Merge pull request #3379 from gophercloud/bp-v2-1514ebc-f9e0418
[v2] CI: Remove Bobcat
2 parents 8d6dabc + 7ccacfa commit 7177265

18 files changed

Lines changed: 1 addition & 88 deletions

‎.github/workflows/functional-baremetal.yaml‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,14 @@ jobs:
1414
- name: "master"
1515
openstack_version: "master"
1616
ubuntu_version: "22.04"
17-
use_system_scope: true
1817
additional_services: "openstack-cli-server"
1918
- name: "dalmatian"
2019
openstack_version: "stable/2024.2"
2120
ubuntu_version: "22.04"
22-
# NOTE(dtantsur): this forces running tests with a system scope
23-
# token, which is required for certain actions. Use it on versions
24-
# starting with 2024.1.
25-
use_system_scope: true
2621
additional_services: "openstack-cli-server"
2722
- name: "caracal"
2823
openstack_version: "stable/2024.1"
2924
ubuntu_version: "22.04"
30-
use_system_scope: true
31-
additional_services: ""
32-
- name: "bobcat"
33-
openstack_version: "stable/2023.2"
34-
ubuntu_version: "22.04"
35-
use_system_scope: false
3625
additional_services: ""
3726
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3827
name: Deploy OpenStack ${{ matrix.name }} with Ironic and run baremetal acceptance tests
@@ -98,8 +87,7 @@ jobs:
9887
DEVSTACK_PATH: ${{ github.workspace }}/devstack
9988
PACKAGE: "./internal/acceptance/openstack/baremetal/..."
10089
OS_BRANCH: ${{ matrix.openstack_version }}
101-
# TODO(dtantsur): default to true when no longer supporting versions before 2024.1
102-
USE_SYSTEM_SCOPE: ${{ matrix.use_system_scope }}
90+
USE_SYSTEM_SCOPE: true
10391
- name: Generate logs on failure
10492
run: ./script/collectlogs
10593
if: failure()

‎.github/workflows/functional-basic.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ jobs:
2626
openstack_version: "stable/2024.1"
2727
ubuntu_version: "22.04"
2828
additional_services: ""
29-
- name: "bobcat"
30-
openstack_version: "stable/2023.2"
31-
ubuntu_version: "22.04"
32-
additional_services: ""
3329
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3430
name: Deploy OpenStack ${{ matrix.name }} with defaults and run basic acceptance tests
3531
steps:

‎.github/workflows/functional-blockstorage.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ jobs:
2323
openstack_version: "stable/2024.1"
2424
ubuntu_version: "22.04"
2525
additional_services: ""
26-
- name: "bobcat"
27-
openstack_version: "stable/2023.2"
28-
ubuntu_version: "22.04"
29-
additional_services: ""
3026
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3127
name: Deploy OpenStack ${{ matrix.name }} with Cinder and run blockstorage acceptance tests
3228
steps:

‎.github/workflows/functional-compute.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ jobs:
2323
openstack_version: "stable/2024.1"
2424
ubuntu_version: "22.04"
2525
additional_services: ""
26-
- name: "bobcat"
27-
openstack_version: "stable/2023.2"
28-
ubuntu_version: "22.04"
29-
additional_services: ""
3026
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3127
name: Deploy OpenStack ${{ matrix.name }} with Nova and run compute acceptance tests
3228
steps:

‎.github/workflows/functional-containerinfra.yaml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,6 @@ jobs:
3838
enable_plugin magnum https://github.com/openstack/magnum stable/2024.1
3939
MAGNUMCLIENT_BRANCH=stable/2024.1
4040
additional_services: ""
41-
- name: "bobcat"
42-
openstack_version: "stable/2023.2"
43-
ubuntu_version: "22.04"
44-
devstack_conf_overrides: |
45-
enable_plugin magnum https://github.com/openstack/magnum stable/2023.2
46-
MAGNUMCLIENT_BRANCH=stable/2023.2
47-
additional_services: ""
4841
runs-on: ubuntu-${{ matrix.ubuntu_version }}
4942
name: Deploy OpenStack ${{ matrix.name }} with Magnum and run containerinfra acceptance tests
5043
steps:

‎.github/workflows/functional-dns.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ jobs:
3030
openstack_version: "stable/2024.1"
3131
ubuntu_version: "22.04"
3232
additional_services: ""
33-
- name: "bobcat"
34-
openstack_version: "stable/2023.2"
35-
ubuntu_version: "22.04"
36-
additional_services: ""
3733
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3834
name: Deploy OpenStack ${{ matrix.name }} with Designate and run dns acceptance tests
3935
steps:

‎.github/workflows/functional-fwaas_v2.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ jobs:
2323
openstack_version: "stable/2024.1"
2424
ubuntu_version: "22.04"
2525
additional_services: ""
26-
- name: "bobcat"
27-
openstack_version: "stable/2023.2"
28-
ubuntu_version: "22.04"
29-
additional_services: ""
3026
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3127
name: Deploy OpenStack ${{ matrix.name }} with enabled FWaaS_v2 and run networking acceptance tests
3228
steps:

‎.github/workflows/functional-identity.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ jobs:
2323
openstack_version: "stable/2024.1"
2424
ubuntu_version: "22.04"
2525
additional_services: ""
26-
- name: "bobcat"
27-
openstack_version: "stable/2023.2"
28-
ubuntu_version: "22.04"
29-
additional_services: ""
3026
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3127
name: Deploy OpenStack ${{ matrix.name }} with Keystone and run identity acceptance tests
3228
steps:

‎.github/workflows/functional-image.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ jobs:
2323
openstack_version: "stable/2024.1"
2424
ubuntu_version: "22.04"
2525
additional_services: ""
26-
- name: "bobcat"
27-
openstack_version: "stable/2023.2"
28-
ubuntu_version: "22.04"
29-
additional_services: ""
3026
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3127
name: Deploy OpenStack ${{ matrix.name }} with Glance and run image acceptance tests
3228
steps:

‎.github/workflows/functional-keymanager.yaml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ jobs:
2929
openstack_version: "stable/2024.1"
3030
ubuntu_version: "22.04"
3131
additional_services: ""
32-
- name: "bobcat"
33-
openstack_version: "stable/2023.2"
34-
ubuntu_version: "22.04"
35-
additional_services: ""
3632
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3733
name: Deploy OpenStack ${{ matrix.name }} with Barbican and run keymanager acceptance tests
3834
steps:

0 commit comments

Comments
 (0)