Skip to content

Commit b728a92

Browse files
EmilienMEmilienM
authored
Merge pull request #3053 from stephenfin/osc-server
Enable openstack-client-server service in functional jobs
2 parents 4af5a04 + f018747 commit b728a92

17 files changed

+128
-54
lines changed

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,27 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
name: ["master"]
14-
openstack_version: ["master"]
15-
ubuntu_version: ["22.04"]
16-
os_system_scope: ["all"]
1713
include:
14+
- name: "master"
15+
openstack_version: "master"
16+
ubuntu_version: "22.04"
17+
os_system_scope: "all"
18+
additional_services: "openstack-cli-server"
1819
- name: "caracal"
1920
openstack_version: "stable/2024.1"
2021
ubuntu_version: "22.04"
2122
os_system_scope: ""
23+
additional_services: ""
2224
- name: "bobcat"
2325
openstack_version: "stable/2023.2"
2426
ubuntu_version: "22.04"
2527
os_system_scope: ""
28+
additional_services: ""
2629
- name: "antelope"
2730
openstack_version: "stable/2023.1"
2831
ubuntu_version: "22.04"
2932
os_system_scope: ""
33+
additional_services: ""
3034
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3135
name: Deploy OpenStack ${{ matrix.name }} with Ironic and run baremetal acceptance tests
3236
steps:
@@ -80,7 +84,7 @@ jobs:
8084
IRONIC_ENABLED_DEPLOY_INTERFACES=direct,fake
8185
SWIFT_ENABLE_TEMPURLS=True
8286
SWIFT_TEMPURL_KEY=secretkey
83-
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'
87+
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 }}"
8488
- name: Checkout go
8589
uses: actions/setup-go@v5
8690
with:

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,23 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
name: ["master"]
17-
openstack_version: ["master"]
18-
ubuntu_version: ["22.04"]
1916
include:
17+
- name: "master"
18+
openstack_version: "master"
19+
ubuntu_version: "22.04"
20+
additional_services: "openstack-cli-server"
2021
- name: "caracal"
2122
openstack_version: "stable/2024.1"
2223
ubuntu_version: "22.04"
24+
additional_services: ""
2325
- name: "bobcat"
2426
openstack_version: "stable/2023.2"
2527
ubuntu_version: "22.04"
28+
additional_services: ""
2629
- name: "antelope"
2730
openstack_version: "stable/2023.1"
2831
ubuntu_version: "22.04"
32+
additional_services: ""
2933
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3034
name: Deploy OpenStack ${{ matrix.name }} with defaults and run basic acceptance tests
3135
steps:
@@ -35,7 +39,7 @@ jobs:
3539
uses: EmilienM/devstack-action@e82a9cbead099cba72f99537e82a360c3e319c69
3640
with:
3741
branch: ${{ matrix.openstack_version }}
38-
enabled_services: 's-account,s-container,s-object,s-proxy'
42+
enabled_services: 's-account,s-container,s-object,s-proxy,${{ matrix.additional_services }}'
3943
- name: Checkout go
4044
uses: actions/setup-go@v5
4145
with:

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,23 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
name: ["master"]
14-
openstack_version: ["master"]
15-
ubuntu_version: ["22.04"]
1613
include:
14+
- name: "master"
15+
openstack_version: "master"
16+
ubuntu_version: "22.04"
17+
additional_services: "openstack-cli-server"
1718
- name: "caracal"
1819
openstack_version: "stable/2024.1"
1920
ubuntu_version: "22.04"
21+
additional_services: ""
2022
- name: "bobcat"
2123
openstack_version: "stable/2023.2"
2224
ubuntu_version: "22.04"
25+
additional_services: ""
2326
- name: "antelope"
2427
openstack_version: "stable/2023.1"
2528
ubuntu_version: "22.04"
29+
additional_services: ""
2630
runs-on: ubuntu-${{ matrix.ubuntu_version }}
2731
name: Deploy OpenStack ${{ matrix.name }} with Cinder and run blockstorage acceptance tests
2832
steps:
@@ -34,7 +38,7 @@ jobs:
3438
branch: ${{ matrix.openstack_version }}
3539
conf_overrides: |
3640
CINDER_ISCSI_HELPER=lioadm
37-
enabled_services: 's-account,s-container,s-object,s-proxy,c-bak'
41+
enabled_services: "s-account,s-container,s-object,s-proxy,c-bak,${{ matrix.additional_services }}"
3842
- name: Checkout go
3943
uses: actions/setup-go@v5
4044
with:

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,23 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
name: ["master"]
14-
openstack_version: ["master"]
15-
ubuntu_version: ["22.04"]
1613
include:
14+
- name: "master"
15+
openstack_version: "master"
16+
ubuntu_version: "22.04"
17+
additional_services: "openstack-cli-server"
1718
- name: "caracal"
1819
openstack_version: "stable/2024.1"
1920
ubuntu_version: "22.04"
21+
additional_services: ""
2022
- name: "bobcat"
2123
openstack_version: "stable/2023.2"
2224
ubuntu_version: "22.04"
25+
additional_services: ""
2326
- name: "antelope"
2427
openstack_version: "stable/2023.1"
2528
ubuntu_version: "22.04"
29+
additional_services: ""
2630
runs-on: ubuntu-${{ matrix.ubuntu_version }}
2731
name: Deploy OpenStack ${{ matrix.name }} with Nova and run compute acceptance tests
2832
steps:
@@ -34,6 +38,7 @@ jobs:
3438
branch: ${{ matrix.openstack_version }}
3539
conf_overrides: |
3640
CINDER_ISCSI_HELPER=lioadm
41+
enabled_services: "${{ matrix.additional_services }}"
3742
- name: Checkout go
3843
uses: actions/setup-go@v5
3944
with:

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,28 @@ jobs:
1717
devstack_conf_overrides: |
1818
enable_plugin magnum https://github.com/openstack/magnum master
1919
MAGNUMCLIENT_BRANCH=master
20+
additional_services: "openstack-cli-server"
2021
- name: "caracal"
2122
openstack_version: "stable/2024.1"
2223
ubuntu_version: "22.04"
2324
devstack_conf_overrides: |
2425
enable_plugin magnum https://github.com/openstack/magnum stable/2024.1
2526
MAGNUMCLIENT_BRANCH=stable/2024.1
27+
additional_services: ""
2628
- name: "bobcat"
2729
openstack_version: "stable/2023.2"
2830
ubuntu_version: "22.04"
2931
devstack_conf_overrides: |
3032
enable_plugin magnum https://github.com/openstack/magnum stable/2023.2
3133
MAGNUMCLIENT_BRANCH=stable/2023.2
34+
additional_services: ""
3235
- name: "antelope"
3336
openstack_version: "stable/2023.1"
3437
ubuntu_version: "22.04"
3538
devstack_conf_overrides: |
3639
enable_plugin magnum https://github.com/openstack/magnum stable/2023.1
3740
MAGNUMCLIENT_BRANCH=stable/2023.1
41+
additional_services: ""
3842
runs-on: ubuntu-${{ matrix.ubuntu_version }}
3943
name: Deploy OpenStack ${{ matrix.name }} with Magnum and run containerinfra acceptance tests
4044
steps:
@@ -51,7 +55,7 @@ jobs:
5155
SWIFT_MAX_FILE_SIZE=5368709122
5256
KEYSTONE_ADMIN_ENDPOINT=true
5357
${{ matrix.devstack_conf_overrides }}
54-
enabled_services: 'h-eng,h-api,h-api-cfn,h-api-cw'
58+
enabled_services: "h-eng,h-api,h-api-cfn,h-api-cw,${{ matrix.additional_services }}"
5559
- name: Checkout go
5660
uses: actions/setup-go@v5
5761
with:

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,19 @@ jobs:
1515
- name: "master"
1616
openstack_version: "master"
1717
ubuntu_version: "22.04"
18+
additional_services: "openstack-cli-server"
1819
- name: "caracal"
1920
openstack_version: "stable/2024.1"
2021
ubuntu_version: "22.04"
22+
additional_services: ""
2123
- name: "bobcat"
2224
openstack_version: "stable/2023.2"
2325
ubuntu_version: "22.04"
26+
additional_services: ""
2427
- name: "antelope"
2528
openstack_version: "stable/2023.1"
2629
ubuntu_version: "22.04"
30+
additional_services: ""
2731
runs-on: ubuntu-${{ matrix.ubuntu_version }}
2832
name: Deploy OpenStack ${{ matrix.name }} with Designate and run dns acceptance tests
2933
steps:
@@ -35,7 +39,7 @@ jobs:
3539
branch: ${{ matrix.openstack_version }}
3640
conf_overrides: |
3741
enable_plugin designate https://github.com/openstack/designate ${{ matrix.openstack_version }}
38-
enabled_services: 'designate,designate-central,designate-api,designate-worker,designate-producer,designate-mdns'
42+
enabled_services: "designate,designate-central,designate-api,designate-worker,designate-producer,designate-mdns,${{ matrix.additional_services }}"
3943
- name: Checkout go
4044
uses: actions/setup-go@v5
4145
with:

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,23 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
name: ["master"]
14-
openstack_version: ["master"]
15-
ubuntu_version: ["22.04"]
1613
include:
14+
- name: "master"
15+
openstack_version: "master"
16+
ubuntu_version: "22.04"
17+
additional_services: "openstack-cli-server"
1718
- name: "caracal"
1819
openstack_version: "stable/2024.1"
1920
ubuntu_version: "22.04"
21+
additional_services: ""
2022
- name: "bobcat"
2123
openstack_version: "stable/2023.2"
2224
ubuntu_version: "22.04"
25+
additional_services: ""
2326
- name: "antelope"
2427
openstack_version: "stable/2023.1"
2528
ubuntu_version: "22.04"
29+
additional_services: ""
2630
runs-on: ubuntu-${{ matrix.ubuntu_version }}
2731
name: Deploy OpenStack ${{ matrix.name }} with enabled FWaaS_v2 and run networking acceptance tests
2832
steps:
@@ -39,7 +43,7 @@ jobs:
3943
Q_ML2_PLUGIN_TYPE_DRIVERS=flat,gre,vlan,vxlan
4044
Q_ML2_TENANT_NETWORK_TYPE=vxlan
4145
Q_TUNNEL_TYPES=vxlan,gre
42-
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'
46+
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 }}'
4347
- name: Checkout go
4448
uses: actions/setup-go@v5
4549
with:

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,23 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
name: ["master"]
14-
openstack_version: ["master"]
15-
ubuntu_version: ["22.04"]
1613
include:
14+
- name: "master"
15+
openstack_version: "master"
16+
ubuntu_version: "22.04"
17+
additional_services: "openstack-cli-server"
1718
- name: "caracal"
1819
openstack_version: "stable/2024.1"
1920
ubuntu_version: "22.04"
21+
additional_services: ""
2022
- name: "bobcat"
2123
openstack_version: "stable/2023.2"
2224
ubuntu_version: "22.04"
25+
additional_services: ""
2326
- name: "antelope"
2427
openstack_version: "stable/2023.1"
2528
ubuntu_version: "22.04"
29+
additional_services: ""
2630
runs-on: ubuntu-${{ matrix.ubuntu_version }}
2731
name: Deploy OpenStack ${{ matrix.name }} with Keystone and run identity acceptance tests
2832
steps:
@@ -32,6 +36,7 @@ jobs:
3236
uses: EmilienM/devstack-action@e82a9cbead099cba72f99537e82a360c3e319c69
3337
with:
3438
branch: ${{ matrix.openstack_version }}
39+
enabled_services: "${{ matrix.additional_services }}"
3540
- name: Checkout go
3641
uses: actions/setup-go@v5
3742
with:

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,23 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
name: ["master"]
14-
openstack_version: ["master"]
15-
ubuntu_version: ["22.04"]
1613
include:
14+
- name: "master"
15+
openstack_version: "master"
16+
ubuntu_version: "22.04"
17+
additional_services: "openstack-cli-server"
1718
- name: "caracal"
1819
openstack_version: "stable/2024.1"
1920
ubuntu_version: "22.04"
21+
additional_services: ""
2022
- name: "bobcat"
2123
openstack_version: "stable/2023.2"
2224
ubuntu_version: "22.04"
25+
additional_services: ""
2326
- name: "antelope"
2427
openstack_version: "stable/2023.1"
2528
ubuntu_version: "22.04"
29+
additional_services: ""
2630
runs-on: ubuntu-${{ matrix.ubuntu_version }}
2731
name: Deploy OpenStack ${{ matrix.name }} with Glance and run image acceptance tests
2832
steps:
@@ -32,6 +36,7 @@ jobs:
3236
uses: EmilienM/devstack-action@e82a9cbead099cba72f99537e82a360c3e319c69
3337
with:
3438
branch: ${{ matrix.openstack_version }}
39+
enabled_services: "${{ matrix.additional_services }}"
3540
- name: Checkout go
3641
uses: actions/setup-go@v5
3742
with:

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,23 @@ jobs:
1010
strategy:
1111
fail-fast: false
1212
matrix:
13-
name: ["master"]
14-
openstack_version: ["master"]
15-
ubuntu_version: ["22.04"]
1613
include:
14+
- name: "master"
15+
openstack_version: "master"
16+
ubuntu_version: "22.04"
17+
additional_services: "openstack-cli-server"
1718
- name: "caracal"
1819
openstack_version: "stable/2024.1"
1920
ubuntu_version: "22.04"
21+
additional_services: ""
2022
- name: "bobcat"
2123
openstack_version: "stable/2023.2"
2224
ubuntu_version: "22.04"
25+
additional_services: ""
2326
- name: "antelope"
2427
openstack_version: "stable/2023.1"
2528
ubuntu_version: "22.04"
29+
additional_services: ""
2630
runs-on: ubuntu-${{ matrix.ubuntu_version }}
2731
name: Deploy OpenStack ${{ matrix.name }} with Barbican and run keymanager acceptance tests
2832
steps:
@@ -34,7 +38,7 @@ jobs:
3438
branch: ${{ matrix.openstack_version }}
3539
conf_overrides: |
3640
enable_plugin barbican https://github.com/openstack/barbican ${{ matrix.openstack_version }}
37-
enabled_services: 'barbican-svc,barbican-retry,barbican-keystone-listener'
41+
enabled_services: "barbican-svc,barbican-retry,barbican-keystone-listener,${{ matrix.additional_services }}"
3842
- name: Checkout go
3943
uses: actions/setup-go@v5
4044
with:

0 commit comments

Comments
 (0)