Skip to content

Commit e2af9ed

Browse files
kayruskayrus
committed
tests: fix devstack master branch tests
1 parent 28dee3f commit e2af9ed

5 files changed

Lines changed: 39 additions & 0 deletions

File tree

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ jobs:
1515
openstack_version: "master"
1616
ubuntu_version: "22.04"
1717
devstack_conf_overrides: |
18+
# ensure we're using a working version of setuptools
19+
if [ -n "\$TOP_DIR" ]; then
20+
sed -i 's/setuptools\[core\]$/setuptools[core]==79.0.1/g' \$TOP_DIR/lib/infra \$TOP_DIR/inc/python
21+
sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra
22+
fi
23+
1824
enable_plugin magnum https://github.com/openstack/magnum master
1925
MAGNUMCLIENT_BRANCH=master
2026
additional_services: "openstack-cli-server"
@@ -54,6 +60,7 @@ jobs:
5460
GLANCE_LIMIT_IMAGE_SIZE_TOTAL=5000
5561
SWIFT_MAX_FILE_SIZE=5368709122
5662
KEYSTONE_ADMIN_ENDPOINT=true
63+
5764
${{ matrix.devstack_conf_overrides }}
5865
enabled_services: "h-eng,h-api,h-api-cfn,h-api-cw,${{ matrix.additional_services }}"
5966
- name: Checkout go

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ jobs:
1515
- name: "master"
1616
openstack_version: "master"
1717
ubuntu_version: "22.04"
18+
devstack_conf_overrides: |
19+
# ensure we're using a working version of setuptools
20+
if [ -n "\$TOP_DIR" ]; then
21+
sed -i 's/setuptools\[core\]$/setuptools[core]==79.0.1/g' \$TOP_DIR/lib/infra \$TOP_DIR/inc/python
22+
sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra
23+
fi
1824
additional_services: "openstack-cli-server"
1925
- name: "dalmatian"
2026
openstack_version: "stable/2024.2"
@@ -39,6 +45,8 @@ jobs:
3945
branch: ${{ matrix.openstack_version }}
4046
conf_overrides: |
4147
enable_plugin designate https://github.com/openstack/designate ${{ matrix.openstack_version }}
48+
49+
${{ matrix.devstack_conf_overrides }}
4250
enabled_services: "designate,designate-central,designate-api,designate-worker,designate-producer,designate-mdns,${{ matrix.additional_services }}"
4351
- name: Checkout go
4452
uses: actions/setup-go@v5

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ jobs:
1414
- name: "master"
1515
openstack_version: "master"
1616
ubuntu_version: "22.04"
17+
devstack_conf_overrides: |
18+
# ensure we're using a working version of setuptools
19+
if [ -n "\$TOP_DIR" ]; then
20+
sed -i 's/setuptools\[core\]$/setuptools[core]==79.0.1/g' \$TOP_DIR/lib/infra \$TOP_DIR/inc/python
21+
sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra
22+
fi
1723
additional_services: "openstack-cli-server"
1824
- name: "dalmatian"
1925
openstack_version: "stable/2024.2"
@@ -38,6 +44,8 @@ jobs:
3844
branch: ${{ matrix.openstack_version }}
3945
conf_overrides: |
4046
enable_plugin barbican https://github.com/openstack/barbican ${{ matrix.openstack_version }}
47+
48+
${{ matrix.devstack_conf_overrides }}
4149
enabled_services: "barbican-svc,barbican-retry,barbican-keystone-listener,${{ matrix.additional_services }}"
4250
- name: Checkout go
4351
uses: actions/setup-go@v5

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ jobs:
1414
- name: "master"
1515
openstack_version: "master"
1616
ubuntu_version: "22.04"
17+
devstack_conf_overrides: |
18+
# ensure we're using a working version of setuptools
19+
if [ -n "\$TOP_DIR" ]; then
20+
sed -i 's/setuptools\[core\]$/setuptools[core]==79.0.1/g' \$TOP_DIR/lib/infra \$TOP_DIR/inc/python
21+
sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra
22+
fi
1723
additional_services: "openstack-cli-server"
1824
- name: "dalmatian"
1925
openstack_version: "stable/2024.2"
@@ -39,6 +45,8 @@ jobs:
3945
conf_overrides: |
4046
enable_plugin octavia https://github.com/openstack/octavia ${{ matrix.openstack_version }}
4147
enable_plugin neutron https://github.com/openstack/neutron ${{ matrix.openstack_version }}
48+
49+
${{ matrix.devstack_conf_overrides }}
4250
enabled_services: "octavia,o-api,o-cw,o-hk,o-hm,o-da,neutron-qos,${{ matrix.additional_services }}"
4351
- name: Checkout go
4452
uses: actions/setup-go@v5

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ jobs:
1414
- name: "master"
1515
openstack_version: "master"
1616
ubuntu_version: "22.04"
17+
devstack_conf_overrides: |
18+
# ensure we're using a working version of setuptools
19+
if [ -n "\$TOP_DIR" ]; then
20+
sed -i 's/setuptools\[core\]$/setuptools[core]==79.0.1/g' \$TOP_DIR/lib/infra \$TOP_DIR/inc/python
21+
sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra
22+
fi
1723
additional_services: "openstack-cli-server"
1824
- name: "dalmatian"
1925
openstack_version: "stable/2024.2"
@@ -52,6 +58,8 @@ jobs:
5258
MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS='snapshot_support=True create_share_from_snapshot_support=True revert_to_snapshot_support=True mount_snapshot_support=True'
5359
MANILA_CONFIGURE_DEFAULT_TYPES=True
5460
MANILA_INSTALL_TEMPEST_PLUGIN_SYSTEMWIDE=false
61+
62+
${{ matrix.devstack_conf_overrides }}
5563
enabled_services: "${{ matrix.additional_services }}"
5664
- name: Checkout go
5765
uses: actions/setup-go@v5

0 commit comments

Comments
 (0)