From 05d4ca892ba9724ec4dbee335765d7ba7f69ba71 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 18 Jul 2025 11:20:01 +0900 Subject: [PATCH] Drop removed devstack parameters MISTRAL_USE_MOD_WSGI and MISTRAL_RPC_IMPLEMENTATION were removed from devstack plugin. Note * MISTRAL_USE_MOD_WSGI defaults to True in stable branches so removing the override does not affect stable branches. * MISTRAL_RPC_IMPLEMENTATION defaults to oslo in all open stable branches so removing the override does not affect any branches, including master. Depends-on: https://review.opendev.org/954952 Change-Id: Ie90a4f23ba598707f315bc858f61e50cb7dcb4d3 Signed-off-by: Takashi Kajinami --- .zuul.yaml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index aa6dac8..9d1ab6b 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -19,8 +19,6 @@ TEMPEST_PLUGINS: "/opt/stack/mistral-tempest-plugin" SWIFT_HASH: secrethash MYSQL_ROOT_PW: secretdatabase - MISTRAL_USE_MOD_WSGI: true - MISTRAL_RPC_IMPLEMENTATION: oslo devstack_services: heat: true h-api: true @@ -46,6 +44,7 @@ required-projects: *base_required_projects vars: *base_vars +# TODO(tkajinam): Remove this after < 2025.1 all reach EOL - job: name: mistral-devstack-non-apache-tempest-ipv6-only parent: mistral-devstack-tempest-ipv6-only @@ -67,6 +66,7 @@ parent: mistral-devstack nodeset: openstack-single-node-jammy +# TODO(tkajinam): Remove this after < 2025.1 all reach EOL - job: name: mistral-devstack-kombu parent: mistral-devstack-tempest-base @@ -74,6 +74,7 @@ devstack_localrc: MISTRAL_RPC_IMPLEMENTATION: kombu +# TODO(tkajinam): Remove this after < 2025.1 all reach EOL - job: name: mistral-devstack-non-apache parent: mistral-devstack-tempest-base @@ -90,14 +91,8 @@ jobs: - mistral-devstack - mistral-devstack-tempest-ipv6-only - - mistral-devstack-non-apache-tempest-ipv6-only - - mistral-devstack-non-apache - - mistral-devstack-kombu queue: mistral gate: jobs: - mistral-devstack - mistral-devstack-tempest-ipv6-only - - mistral-devstack-non-apache-tempest-ipv6-only - - mistral-devstack-non-apache - - mistral-devstack-kombu