From fea4f727dd9dabad9ca3cb79e76474b8159f2292 Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Wed, 4 Dec 2024 16:03:01 +0000 Subject: [PATCH] [WSGI] Keep eventlet server for older versions of NDR Related-Bug: #2069581 Topic: eventlet-deprecation Change-Id: I76e1ec7d5a82ed6416b12b3866c70a0d3127eb24 --- zuul.d/2023_1_jobs.yaml | 3 +++ zuul.d/2023_2_jobs.yaml | 3 +++ zuul.d/2024_1_jobs.yaml | 3 +++ zuul.d/victoria_jobs.yaml | 2 ++ zuul.d/wallaby_jobs.yaml | 2 ++ zuul.d/zed_jobs.yaml | 1 + 6 files changed, 14 insertions(+) diff --git a/zuul.d/2023_1_jobs.yaml b/zuul.d/2023_1_jobs.yaml index 26b1efbf..706a5d64 100644 --- a/zuul.d/2023_1_jobs.yaml +++ b/zuul.d/2023_1_jobs.yaml @@ -278,6 +278,9 @@ parent: neutron-tempest-plugin-dynamic-routing nodeset: openstack-single-node-jammy override-checkout: stable/2023.1 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-fwaas-2023-1 diff --git a/zuul.d/2023_2_jobs.yaml b/zuul.d/2023_2_jobs.yaml index b45ebb62..92eac855 100644 --- a/zuul.d/2023_2_jobs.yaml +++ b/zuul.d/2023_2_jobs.yaml @@ -273,6 +273,9 @@ parent: neutron-tempest-plugin-dynamic-routing nodeset: openstack-single-node-jammy override-checkout: stable/2023.2 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-fwaas-2023-2 diff --git a/zuul.d/2024_1_jobs.yaml b/zuul.d/2024_1_jobs.yaml index 40dafc84..469fb67c 100644 --- a/zuul.d/2024_1_jobs.yaml +++ b/zuul.d/2024_1_jobs.yaml @@ -272,6 +272,9 @@ parent: neutron-tempest-plugin-dynamic-routing nodeset: openstack-single-node-jammy override-checkout: stable/2024.1 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-fwaas-2024-1 diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml index 817e7599..e38ffe79 100644 --- a/zuul.d/victoria_jobs.yaml +++ b/zuul.d/victoria_jobs.yaml @@ -317,6 +317,8 @@ required-projects: *required-projects-victoria vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-vpnaas-victoria diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml index 56ed2cfa..740f9164 100644 --- a/zuul.d/wallaby_jobs.yaml +++ b/zuul.d/wallaby_jobs.yaml @@ -248,6 +248,8 @@ required-projects: *required-projects-wallaby vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-vpnaas-wallaby diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml index 70ab40af..4f6a8333 100644 --- a/zuul.d/zed_jobs.yaml +++ b/zuul.d/zed_jobs.yaml @@ -266,6 +266,7 @@ Q_AGENT: openvswitch Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch + NEUTRON_DEPLOY_MOD_WSGI: false devstack_services: # Disable OVN services br-ex-tcpdump: false