Skip to content

Commit 3260d63

Browse files
stephenfinstephenfin
committed
Always enable openstack-cli-server
All tested versions of OpenStack now support this allowing us to simplify our jobs. Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
1 parent 06ae96c commit 3260d63

18 files changed

+18
-72
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@ jobs:
1313
- name: "master"
1414
openstack_version: "master"
1515
ubuntu_version: "24.04"
16-
additional_services: "openstack-cli-server"
1716
- name: "epoxy"
1817
openstack_version: "stable/2025.1"
1918
ubuntu_version: "24.04"
20-
additional_services: "openstack-cli-server"
2119
- name: "dalmatian"
2220
openstack_version: "stable/2024.2"
2321
ubuntu_version: "22.04"
24-
additional_services: "openstack-cli-server"
2522
runs-on: ubuntu-${{ matrix.ubuntu_version }}
2623
name: Ironic on OpenStack ${{ matrix.name }}
2724
steps:
@@ -96,7 +93,7 @@ jobs:
9693
IRONIC_ENABLED_DEPLOY_INTERFACES=direct,fake
9794
SWIFT_ENABLE_TEMPURLS=True
9895
SWIFT_TEMPURL_KEY=secretkey
99-
enabled_services: "ir-api,ir-cond,s-account,s-container,s-object,s-proxy,q-svc,q-agt,q-dhcp,q-l3,q-meta,-cinder,-c-sch,-c-api,-c-vol,-c-bak,-ovn,-ovn-controller,-ovn-northd,-q-ovn-metadata-agent,${{ matrix.additional_services }}"
96+
enabled_services: "ir-api,ir-cond,s-account,s-container,s-object,s-proxy,q-svc,q-agt,q-dhcp,q-l3,q-meta,-cinder,-c-sch,-c-api,-c-vol,-c-bak,-ovn,-ovn-controller,-ovn-northd,-q-ovn-metadata-agent,openstack-cli-server"
10097

10198
- name: Checkout go
10299
if: ${{ fromJSON(steps.changed-files.outputs.matches) }}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@ jobs:
1313
- name: "master"
1414
openstack_version: "master"
1515
ubuntu_version: "24.04"
16-
additional_services: "openstack-cli-server"
1716
- name: "epoxy"
1817
openstack_version: "stable/2025.1"
1918
ubuntu_version: "24.04"
20-
additional_services: "openstack-cli-server"
2119
- name: "dalmatian"
2220
openstack_version: "stable/2024.2"
2321
ubuntu_version: "22.04"
24-
additional_services: "openstack-cli-server"
2522
runs-on: ubuntu-${{ matrix.ubuntu_version }}
2623
name: basic tests on OpenStack ${{ matrix.name }}
2724
steps:
@@ -50,7 +47,7 @@ jobs:
5047
uses: gophercloud/devstack-action@60ca1042045c0c9e3e001c64575d381654ffcba1
5148
with:
5249
branch: ${{ matrix.openstack_version }}
53-
enabled_services: 's-account,s-container,s-object,s-proxy,${{ matrix.additional_services }}'
50+
enabled_services: 's-account,s-container,s-object,s-proxy,openstack-cli-server'
5451

5552
- name: Checkout go
5653
if: ${{ fromJSON(steps.changed-files.outputs.matches) }}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@ jobs:
1313
- name: "master"
1414
openstack_version: "master"
1515
ubuntu_version: "24.04"
16-
additional_services: "openstack-cli-server"
1716
- name: "epoxy"
1817
openstack_version: "stable/2025.1"
1918
ubuntu_version: "24.04"
20-
additional_services: "openstack-cli-server"
2119
- name: "dalmatian"
2220
openstack_version: "stable/2024.2"
2321
ubuntu_version: "22.04"
24-
additional_services: "openstack-cli-server"
2522
runs-on: ubuntu-${{ matrix.ubuntu_version }}
2623
name: Cinder on OpenStack ${{ matrix.name }}
2724
steps:
@@ -56,7 +53,7 @@ jobs:
5653
branch: ${{ matrix.openstack_version }}
5754
conf_overrides: |
5855
CINDER_ISCSI_HELPER=lioadm
59-
enabled_services: "s-account,s-container,s-object,s-proxy,c-bak,${{ matrix.additional_services }}"
56+
enabled_services: "s-account,s-container,s-object,s-proxy,c-bak,openstack-cli-server"
6057

6158
- name: Checkout go
6259
if: ${{ fromJSON(steps.changed-files.outputs.matches) }}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@ jobs:
1313
- name: "master"
1414
openstack_version: "master"
1515
ubuntu_version: "24.04"
16-
additional_services: "openstack-cli-server"
1716
- name: "epoxy"
1817
openstack_version: "stable/2025.1"
1918
ubuntu_version: "24.04"
20-
additional_services: "openstack-cli-server"
2119
- name: "dalmatian"
2220
openstack_version: "stable/2024.2"
2321
ubuntu_version: "22.04"
24-
additional_services: "openstack-cli-server"
2522
runs-on: ubuntu-${{ matrix.ubuntu_version }}
2623
name: Nova on OpenStack ${{ matrix.name }}
2724
steps:
@@ -56,7 +53,7 @@ jobs:
5653
branch: ${{ matrix.openstack_version }}
5754
conf_overrides: |
5855
CINDER_ISCSI_HELPER=lioadm
59-
enabled_services: "${{ matrix.additional_services }}"
56+
enabled_services: "openstack-cli-server"
6057

6158
- name: Checkout go
6259
if: ${{ fromJSON(steps.changed-files.outputs.matches) }}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
2323
enable_plugin magnum https://github.com/openstack/magnum master
2424
MAGNUMCLIENT_BRANCH=master
25-
additional_services: "openstack-cli-server"
2625
- name: "epoxy"
2726
openstack_version: "stable/2025.1"
2827
ubuntu_version: "24.04"
@@ -35,14 +34,12 @@ jobs:
3534
3635
enable_plugin magnum https://github.com/openstack/magnum stable/2025.1
3736
MAGNUMCLIENT_BRANCH=stable/2025.1
38-
additional_services: "openstack-cli-server"
3937
- name: "dalmatian"
4038
openstack_version: "stable/2024.2"
4139
ubuntu_version: "22.04"
4240
devstack_conf_overrides: |
4341
enable_plugin magnum https://github.com/openstack/magnum stable/2024.2
4442
MAGNUMCLIENT_BRANCH=stable/2024.2
45-
additional_services: "openstack-cli-server"
4643
runs-on: ubuntu-${{ matrix.ubuntu_version }}
4744
name: Magnum on OpenStack ${{ matrix.name }}
4845
steps:
@@ -83,7 +80,7 @@ jobs:
8380
KEYSTONE_ADMIN_ENDPOINT=true
8481
8582
${{ matrix.devstack_conf_overrides }}
86-
enabled_services: "h-eng,h-api,h-api-cfn,h-api-cw,${{ matrix.additional_services }}"
83+
enabled_services: "h-eng,h-api,h-api-cfn,h-api-cw,openstack-cli-server"
8784

8885
- name: Checkout go
8986
if: ${{ fromJSON(steps.changed-files.outputs.matches) }}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,12 @@ jobs:
1919
sed -i 's/setuptools\[core\]$/setuptools[core]==79.0.1/g' \$TOP_DIR/lib/infra \$TOP_DIR/inc/python
2020
sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra
2121
fi
22-
additional_services: "openstack-cli-server"
2322
- name: "epoxy"
2423
openstack_version: "stable/2025.1"
2524
ubuntu_version: "24.04"
26-
additional_services: "openstack-cli-server"
2725
- name: "dalmatian"
2826
openstack_version: "stable/2024.2"
2927
ubuntu_version: "22.04"
30-
additional_services: "openstack-cli-server"
3128
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3229
name: Designate on OpenStack ${{ matrix.name }}
3330
steps:
@@ -64,7 +61,7 @@ jobs:
6461
enable_plugin designate https://github.com/openstack/designate ${{ matrix.openstack_version }}
6562
6663
${{ matrix.devstack_conf_overrides }}
67-
enabled_services: "designate,designate-central,designate-api,designate-worker,designate-producer,designate-mdns,${{ matrix.additional_services }}"
64+
enabled_services: "designate,designate-central,designate-api,designate-worker,designate-producer,designate-mdns,openstack-cli-server"
6865

6966
- name: Checkout go
7067
if: ${{ fromJSON(steps.changed-files.outputs.matches) }}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,12 @@ jobs:
1717
- name: "master"
1818
openstack_version: "master"
1919
ubuntu_version: "24.04"
20-
additional_services: "openstack-cli-server"
2120
- name: "epoxy"
2221
openstack_version: "stable/2025.1"
2322
ubuntu_version: "24.04"
24-
additional_services: "openstack-cli-server"
2523
- name: "dalmatian"
2624
openstack_version: "stable/2024.2"
2725
ubuntu_version: "22.04"
28-
additional_services: "openstack-cli-server"
2926
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3027
name: FWaaS_v2 on OpenStack ${{ matrix.name }}
3128
steps:
@@ -79,7 +76,7 @@ jobs:
7976
[[post-config|\$NEUTRON_CONF]]
8077
[oslo_policy]
8178
policy_dirs = /tmp/neutron-policies
82-
enabled_services: 'q-svc,q-agt,q-dhcp,q-l3,q-meta,q-fwaas-v2,-cinder,-horizon,-tempest,-swift,-c-sch,-c-api,-c-vol,-c-bak,-ovn,-ovn-controller,-ovn-northd,-q-ovn-metadata-agent,${{ matrix.additional_services }}'
79+
enabled_services: 'q-svc,q-agt,q-dhcp,q-l3,q-meta,q-fwaas-v2,-cinder,-horizon,-tempest,-swift,-c-sch,-c-api,-c-vol,-c-bak,-ovn,-ovn-controller,-ovn-northd,-q-ovn-metadata-agent,openstack-cli-server'
8380

8481
- name: Checkout go
8582
if: ${{ fromJSON(steps.changed-files.outputs.matches) }}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@ jobs:
1313
- name: "master"
1414
openstack_version: "master"
1515
ubuntu_version: "24.04"
16-
additional_services: "openstack-cli-server"
1716
- name: "epoxy"
1817
openstack_version: "stable/2025.1"
1918
ubuntu_version: "24.04"
20-
additional_services: "openstack-cli-server"
2119
- name: "dalmatian"
2220
openstack_version: "stable/2024.2"
2321
ubuntu_version: "22.04"
24-
additional_services: "openstack-cli-server"
2522
runs-on: ubuntu-${{ matrix.ubuntu_version }}
2623
name: Keystone on OpenStack ${{ matrix.name }}
2724
steps:
@@ -54,7 +51,7 @@ jobs:
5451
uses: gophercloud/devstack-action@60ca1042045c0c9e3e001c64575d381654ffcba1
5552
with:
5653
branch: ${{ matrix.openstack_version }}
57-
enabled_services: "${{ matrix.additional_services }}"
54+
enabled_services: "openstack-cli-server"
5855

5956
- name: Checkout go
6057
if: ${{ fromJSON(steps.changed-files.outputs.matches) }}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,12 @@ jobs:
1313
- name: "master"
1414
openstack_version: "master"
1515
ubuntu_version: "24.04"
16-
additional_services: "openstack-cli-server"
1716
- name: "epoxy"
1817
openstack_version: "stable/2025.1"
1918
ubuntu_version: "24.04"
20-
additional_services: "openstack-cli-server"
2119
- name: "dalmatian"
2220
openstack_version: "stable/2024.2"
2321
ubuntu_version: "22.04"
24-
additional_services: "openstack-cli-server"
2522
runs-on: ubuntu-${{ matrix.ubuntu_version }}
2623
name: Glance on OpenStack ${{ matrix.name }}
2724
steps:
@@ -54,7 +51,7 @@ jobs:
5451
uses: gophercloud/devstack-action@60ca1042045c0c9e3e001c64575d381654ffcba1
5552
with:
5653
branch: ${{ matrix.openstack_version }}
57-
enabled_services: "${{ matrix.additional_services }}"
54+
enabled_services: "openstack-cli-server"
5855

5956
- name: Checkout go
6057
if: ${{ fromJSON(steps.changed-files.outputs.matches) }}

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
sed -i 's/setuptools\[core\]$/setuptools[core]==79.0.1/g' \$TOP_DIR/lib/infra \$TOP_DIR/inc/python
2020
sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra
2121
fi
22-
additional_services: "openstack-cli-server"
2322
- name: "epoxy"
2423
openstack_version: "stable/2025.1"
2524
ubuntu_version: "24.04"
@@ -29,11 +28,9 @@ jobs:
2928
sed -i 's/setuptools\[core\]$/setuptools[core]==79.0.1/g' \$TOP_DIR/lib/infra \$TOP_DIR/inc/python
3029
sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra
3130
fi
32-
additional_services: "openstack-cli-server"
3331
- name: "dalmatian"
3432
openstack_version: "stable/2024.2"
3533
ubuntu_version: "22.04"
36-
additional_services: "openstack-cli-server"
3734
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3835
name: Barbican on OpenStack ${{ matrix.name }}
3936
steps:
@@ -70,7 +67,7 @@ jobs:
7067
enable_plugin barbican https://github.com/openstack/barbican ${{ matrix.openstack_version }}
7168
7269
${{ matrix.devstack_conf_overrides }}
73-
enabled_services: "barbican-svc,barbican-retry,barbican-keystone-listener,${{ matrix.additional_services }}"
70+
enabled_services: "barbican-svc,barbican-retry,barbican-keystone-listener,openstack-cli-server"
7471

7572
- name: Checkout go
7673
if: ${{ fromJSON(steps.changed-files.outputs.matches) }}

0 commit comments

Comments
 (0)