diff --git a/.github/workflows/functional-baremetal.yaml b/.github/workflows/functional-baremetal.yaml index ddbc82265e..14d6636fbd 100644 --- a/.github/workflows/functional-baremetal.yaml +++ b/.github/workflows/functional-baremetal.yaml @@ -16,6 +16,10 @@ jobs: openstack_version: "master" ubuntu_version: "24.04" additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-basic.yaml b/.github/workflows/functional-basic.yaml index 103dd1f79a..64eeec76d8 100644 --- a/.github/workflows/functional-basic.yaml +++ b/.github/workflows/functional-basic.yaml @@ -18,6 +18,10 @@ jobs: openstack_version: "master" ubuntu_version: "24.04" additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-blockstorage.yaml b/.github/workflows/functional-blockstorage.yaml index 5b2b0b2240..2d941c02a3 100644 --- a/.github/workflows/functional-blockstorage.yaml +++ b/.github/workflows/functional-blockstorage.yaml @@ -16,6 +16,10 @@ jobs: openstack_version: "master" ubuntu_version: "24.04" additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-compute.yaml b/.github/workflows/functional-compute.yaml index bed7c45c53..6068ed5579 100644 --- a/.github/workflows/functional-compute.yaml +++ b/.github/workflows/functional-compute.yaml @@ -16,6 +16,10 @@ jobs: openstack_version: "master" ubuntu_version: "24.04" additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-containerinfra.yaml b/.github/workflows/functional-containerinfra.yaml index 8834a24f7c..97cf2a5889 100644 --- a/.github/workflows/functional-containerinfra.yaml +++ b/.github/workflows/functional-containerinfra.yaml @@ -25,6 +25,19 @@ jobs: enable_plugin magnum https://github.com/openstack/magnum master MAGNUMCLIENT_BRANCH=master additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + devstack_conf_overrides: | + # ensure we're using a working version of setuptools + if [ -n "\$TOP_DIR" ]; then + sed -i 's/setuptools\[core\]$/setuptools[core]==79.0.1/g' \$TOP_DIR/lib/infra \$TOP_DIR/inc/python + sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra + fi + + enable_plugin magnum https://github.com/openstack/magnum stable/2025.1 + MAGNUMCLIENT_BRANCH=stable/2025.1 + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-dns.yaml b/.github/workflows/functional-dns.yaml index 969765a3b3..643778a729 100644 --- a/.github/workflows/functional-dns.yaml +++ b/.github/workflows/functional-dns.yaml @@ -22,6 +22,10 @@ jobs: sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra fi additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-fwaas_v2.yaml b/.github/workflows/functional-fwaas_v2.yaml index 01ab0fe427..b6770476c7 100644 --- a/.github/workflows/functional-fwaas_v2.yaml +++ b/.github/workflows/functional-fwaas_v2.yaml @@ -20,6 +20,10 @@ jobs: openstack_version: "master" ubuntu_version: "24.04" additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-identity.yaml b/.github/workflows/functional-identity.yaml index 4967f807ed..e2de054dd7 100644 --- a/.github/workflows/functional-identity.yaml +++ b/.github/workflows/functional-identity.yaml @@ -16,6 +16,10 @@ jobs: openstack_version: "master" ubuntu_version: "24.04" additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-image.yaml b/.github/workflows/functional-image.yaml index 2913e6d03e..39f009d733 100644 --- a/.github/workflows/functional-image.yaml +++ b/.github/workflows/functional-image.yaml @@ -16,6 +16,10 @@ jobs: openstack_version: "master" ubuntu_version: "24.04" additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-keymanager.yaml b/.github/workflows/functional-keymanager.yaml index 92b6d632c4..e39d3803dd 100644 --- a/.github/workflows/functional-keymanager.yaml +++ b/.github/workflows/functional-keymanager.yaml @@ -22,6 +22,16 @@ jobs: sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra fi additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + devstack_conf_overrides: | + # ensure we're using a working version of setuptools + if [ -n "\$TOP_DIR" ]; then + sed -i 's/setuptools\[core\]$/setuptools[core]==79.0.1/g' \$TOP_DIR/lib/infra \$TOP_DIR/inc/python + sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra + fi + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-loadbalancer.yaml b/.github/workflows/functional-loadbalancer.yaml index a7896ad8fa..4271bb3832 100644 --- a/.github/workflows/functional-loadbalancer.yaml +++ b/.github/workflows/functional-loadbalancer.yaml @@ -22,6 +22,10 @@ jobs: sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra fi additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-messaging.yaml b/.github/workflows/functional-messaging.yaml index 8f81626509..658abc8a97 100644 --- a/.github/workflows/functional-messaging.yaml +++ b/.github/workflows/functional-messaging.yaml @@ -16,6 +16,10 @@ jobs: openstack_version: "master" ubuntu_version: "24.04" additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-networking.yaml b/.github/workflows/functional-networking.yaml index 6d6f65ee65..a8814d571a 100644 --- a/.github/workflows/functional-networking.yaml +++ b/.github/workflows/functional-networking.yaml @@ -16,6 +16,10 @@ jobs: openstack_version: "master" ubuntu_version: "24.04" additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-objectstorage.yaml b/.github/workflows/functional-objectstorage.yaml index accccc8195..4e60758186 100644 --- a/.github/workflows/functional-objectstorage.yaml +++ b/.github/workflows/functional-objectstorage.yaml @@ -16,6 +16,10 @@ jobs: openstack_version: "master" ubuntu_version: "24.04" additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-orchestration.yaml b/.github/workflows/functional-orchestration.yaml index d95ac0c24c..38b6c7b7a7 100644 --- a/.github/workflows/functional-orchestration.yaml +++ b/.github/workflows/functional-orchestration.yaml @@ -16,6 +16,10 @@ jobs: openstack_version: "master" ubuntu_version: "24.04" additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-placement.yaml b/.github/workflows/functional-placement.yaml index 31781d9d09..9df95058cd 100644 --- a/.github/workflows/functional-placement.yaml +++ b/.github/workflows/functional-placement.yaml @@ -16,6 +16,10 @@ jobs: openstack_version: "master" ubuntu_version: "24.04" additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-sharedfilesystems.yaml b/.github/workflows/functional-sharedfilesystems.yaml index 3eb2600d74..eb7b258be7 100644 --- a/.github/workflows/functional-sharedfilesystems.yaml +++ b/.github/workflows/functional-sharedfilesystems.yaml @@ -22,6 +22,10 @@ jobs: sed -i 's/pip_install "-U" "pbr"/pip_install "-U" "pbr" "setuptools[core]==79.0.1"/g' \$TOP_DIR/lib/infra fi additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04" diff --git a/.github/workflows/functional-workflow.yaml b/.github/workflows/functional-workflow.yaml index 30d9d67b56..871ec1aa7e 100644 --- a/.github/workflows/functional-workflow.yaml +++ b/.github/workflows/functional-workflow.yaml @@ -17,6 +17,11 @@ jobs: ubuntu_version: "24.04" mistral_plugin_version: "master" additional_services: "openstack-cli-server" + - name: "epoxy" + openstack_version: "stable/2025.1" + ubuntu_version: "22.04" + mistral_plugin_version: "stable/2025.1" + additional_services: "openstack-cli-server" - name: "dalmatian" openstack_version: "stable/2024.2" ubuntu_version: "22.04"