diff --git a/zuul.d/2023_1_jobs.yaml b/zuul.d/2023_1_jobs.yaml index 6bf7027d..4325b837 100644 --- a/zuul.d/2023_1_jobs.yaml +++ b/zuul.d/2023_1_jobs.yaml @@ -95,6 +95,7 @@ - uplink-status-propagation devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -129,6 +130,7 @@ (^neutron_tempest_plugin.scenario.test_security_groups.StatelessNetworkSecGroupTest.test_established_tcp_session_after_re_attachinging_sg)" devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -238,6 +240,7 @@ - dvr devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_dvr) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-designate-scenario-2023-1 @@ -250,11 +253,17 @@ name: neutron-tempest-plugin-sfc-2023-1 parent: neutron-tempest-plugin-sfc override-checkout: stable/2023.1 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-bgpvpn-bagpipe-2023-1 parent: neutron-tempest-plugin-bgpvpn-bagpipe override-checkout: stable/2023.1 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-dynamic-routing-2023-1 @@ -265,13 +274,22 @@ name: neutron-tempest-plugin-fwaas-2023-1 parent: neutron-tempest-plugin-fwaas override-checkout: stable/2023.1 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-vpnaas-2023-1 parent: neutron-tempest-plugin-vpnaas override-checkout: stable/2023.1 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-tap-as-a-service-2023-1 parent: neutron-tempest-plugin-tap-as-a-service override-checkout: stable/2023.1 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false diff --git a/zuul.d/2023_2_jobs.yaml b/zuul.d/2023_2_jobs.yaml index 87092a93..74064404 100644 --- a/zuul.d/2023_2_jobs.yaml +++ b/zuul.d/2023_2_jobs.yaml @@ -95,6 +95,7 @@ - uplink-status-propagation devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -124,6 +125,7 @@ (^neutron_tempest_plugin.scenario.test_security_groups.StatelessNetworkSecGroupTest.test_established_tcp_session_after_re_attachinging_sg)" devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -233,6 +235,7 @@ - dvr devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_dvr) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-designate-scenario-2023-2 @@ -245,11 +248,17 @@ name: neutron-tempest-plugin-sfc-2023-2 parent: neutron-tempest-plugin-sfc override-checkout: stable/2023.2 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-bgpvpn-bagpipe-2023-2 parent: neutron-tempest-plugin-bgpvpn-bagpipe override-checkout: stable/2023.2 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-dynamic-routing-2023-2 @@ -260,13 +269,22 @@ name: neutron-tempest-plugin-fwaas-2023-2 parent: neutron-tempest-plugin-fwaas override-checkout: stable/2023.2 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-vpnaas-2023-2 parent: neutron-tempest-plugin-vpnaas override-checkout: stable/2023.2 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-tap-as-a-service-2023-2 parent: neutron-tempest-plugin-tap-as-a-service override-checkout: stable/2023.2 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false diff --git a/zuul.d/2024_1_jobs.yaml b/zuul.d/2024_1_jobs.yaml index 022e4391..f0a182ba 100644 --- a/zuul.d/2024_1_jobs.yaml +++ b/zuul.d/2024_1_jobs.yaml @@ -97,6 +97,7 @@ - uplink-status-propagation devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -126,6 +127,7 @@ (^neutron_tempest_plugin.scenario.test_security_groups.StatelessNetworkSecGroupTest.test_established_tcp_session_after_re_attachinging_sg)" devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -232,6 +234,7 @@ - dvr devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_dvr) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-designate-scenario-2024-1 @@ -244,11 +247,17 @@ name: neutron-tempest-plugin-sfc-2024-1 parent: neutron-tempest-plugin-sfc override-checkout: stable/2024.1 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-bgpvpn-bagpipe-2024-1 parent: neutron-tempest-plugin-bgpvpn-bagpipe override-checkout: stable/2024.1 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-dynamic-routing-2024-1 @@ -259,13 +268,22 @@ name: neutron-tempest-plugin-fwaas-2024-1 parent: neutron-tempest-plugin-fwaas override-checkout: stable/2024.1 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-vpnaas-2024-1 parent: neutron-tempest-plugin-vpnaas override-checkout: stable/2024.1 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-tap-as-a-service-2024-1 parent: neutron-tempest-plugin-tap-as-a-service override-checkout: stable/2024.1 + vars: + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml index 393e7726..90379a1b 100644 --- a/zuul.d/master_jobs.yaml +++ b/zuul.d/master_jobs.yaml @@ -264,6 +264,7 @@ Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: true devstack_local_conf: post-config: $NEUTRON_CONF: @@ -377,6 +378,7 @@ Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: true devstack_local_conf: post-config: $NEUTRON_CONF: @@ -844,6 +846,7 @@ Q_AGENT: openvswitch Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch + NEUTRON_DEPLOY_MOD_WSGI: true devstack_plugins: neutron: https://opendev.org/openstack/neutron.git neutron-tempest-plugin: https://opendev.org/openstack/neutron-tempest-plugin.git @@ -1171,6 +1174,7 @@ Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_sfc) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: true # TODO(bcafarel): tests still fail from time to time in parallel # https://bugs.launchpad.net/neutron/+bug/1851500 # https://bugs.launchpad.net/networking-sfc/+bug/1660366 @@ -1250,6 +1254,7 @@ BAGPIPE_DATAPLANE_DRIVER_IPVPN: "ovs" BAGPIPE_BGP_PEERS: "-" NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_bgpvpn) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: true devstack_plugins: networking-bgpvpn: https://git.openstack.org/openstack/networking-bgpvpn networking-bagpipe: https://git.openstack.org/openstack/networking-bagpipe @@ -1379,6 +1384,7 @@ Q_AGENT: openvswitch Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch + NEUTRON_DEPLOY_MOD_WSGI: true devstack_services: # Disable OVN services br-ex-tcpdump: false @@ -1456,6 +1462,7 @@ Q_AGENT: openvswitch Q_ML2_TENANT_NETWORK_TYPE: vxlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch + NEUTRON_DEPLOY_MOD_WSGI: true devstack_services: # Disable OVN services br-ex-tcpdump: false @@ -1606,6 +1613,7 @@ Q_AGENT: openvswitch Q_ML2_TENANT_NETWORK_TYPE: vxlan,vlan Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch + NEUTRON_DEPLOY_MOD_WSGI: true devstack_local_conf: post-config: /$NEUTRON_CORE_PLUGIN_CONF: diff --git a/zuul.d/victoria_jobs.yaml b/zuul.d/victoria_jobs.yaml index d98de844..291e01d7 100644 --- a/zuul.d/victoria_jobs.yaml +++ b/zuul.d/victoria_jobs.yaml @@ -151,6 +151,7 @@ ADVANCED_INSTANCE_TYPE: ds512M ADVANCED_INSTANCE_USER: ubuntu CUSTOMIZE_IMAGE: false + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -183,6 +184,7 @@ ADVANCED_INSTANCE_TYPE: ds512M ADVANCED_INSTANCE_USER: ubuntu CUSTOMIZE_IMAGE: false + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -257,6 +259,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-designate-scenario-victoria @@ -278,6 +282,7 @@ ADVANCED_INSTANCE_TYPE: ds512M ADVANCED_INSTANCE_USER: ubuntu CUSTOMIZE_IMAGE: false + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-sfc-victoria @@ -287,6 +292,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-bgpvpn-bagpipe-victoria @@ -296,6 +303,8 @@ required-projects: *required-projects-victoria vars: network_api_extensions: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-dynamic-routing-victoria @@ -314,3 +323,5 @@ required-projects: *required-projects-victoria vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false diff --git a/zuul.d/wallaby_jobs.yaml b/zuul.d/wallaby_jobs.yaml index 48b56b2f..7df6876a 100644 --- a/zuul.d/wallaby_jobs.yaml +++ b/zuul.d/wallaby_jobs.yaml @@ -109,6 +109,7 @@ network_available_features: *available_features devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -136,6 +137,7 @@ (^neutron_tempest_plugin.scenario.test_security_groups.NetworkSecGroupTest.test_established_tcp_session_after_re_attachinging_sg)" devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -194,6 +196,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-designate-scenario-wallaby @@ -217,6 +221,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-bgpvpn-bagpipe-wallaby @@ -226,6 +232,8 @@ required-projects: *required-projects-wallaby vars: network_api_extensions: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-dynamic-routing-wallaby @@ -244,3 +252,5 @@ required-projects: *required-projects-wallaby vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false diff --git a/zuul.d/xena_jobs.yaml b/zuul.d/xena_jobs.yaml index fc0b84f3..e1e13c46 100644 --- a/zuul.d/xena_jobs.yaml +++ b/zuul.d/xena_jobs.yaml @@ -111,6 +111,7 @@ network_available_features: *available_features devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -131,6 +132,7 @@ network_available_features: *available_features devstack_localrc: NETWORK_API_EXTENSIONS: "{{ network_api_extensions | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -187,6 +189,8 @@ required-projects: *required-projects-xena vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-designate-scenario-xena @@ -204,6 +208,8 @@ required-projects: *required-projects-xena vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-bgpvpn-bagpipe-xena @@ -213,6 +219,8 @@ required-projects: *required-projects-xena vars: network_api_extensions: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-dynamic-routing-xena @@ -227,6 +235,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 @@ -253,6 +262,8 @@ required-projects: *required-projects-xena vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-tap-as-a-service-xena @@ -262,3 +273,5 @@ required-projects: *required-projects-xena vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false diff --git a/zuul.d/yoga_jobs.yaml b/zuul.d/yoga_jobs.yaml index af7f97e5..6e0ddcd8 100644 --- a/zuul.d/yoga_jobs.yaml +++ b/zuul.d/yoga_jobs.yaml @@ -114,6 +114,7 @@ network_available_features: *available_features devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_openvswitch) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -135,6 +136,7 @@ network_available_features: *available_features devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions + network_api_extensions_openvswitch) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -195,6 +197,8 @@ required-projects: *required-projects-yoga vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-designate-scenario-yoga @@ -213,6 +217,8 @@ required-projects: *required-projects-yoga vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-bgpvpn-bagpipe-yoga @@ -222,6 +228,8 @@ required-projects: *required-projects-yoga vars: network_api_extensions: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-dynamic-routing-yoga @@ -236,6 +244,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 @@ -262,6 +271,8 @@ required-projects: *required-projects-yoga vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-tap-as-a-service-yoga @@ -271,3 +282,5 @@ required-projects: *required-projects-yoga vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml index b0022185..176527de 100644 --- a/zuul.d/zed_jobs.yaml +++ b/zuul.d/zed_jobs.yaml @@ -102,6 +102,7 @@ - ipv6_metadata devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -137,6 +138,7 @@ network_available_features: *available_features devstack_localrc: NETWORK_API_EXTENSIONS: "{{ (network_api_extensions_common + network_api_extensions_openvswitch) | join(',') }}" + NEUTRON_DEPLOY_MOD_WSGI: false devstack_local_conf: test-config: $TEMPEST_CONFIG: @@ -208,6 +210,8 @@ required-projects: *required-projects-zed vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-designate-scenario-zed @@ -226,6 +230,8 @@ required-projects: *required-projects-zed vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-bgpvpn-bagpipe-zed @@ -235,6 +241,8 @@ required-projects: *required-projects-zed vars: network_api_extensions: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-dynamic-routing-zed @@ -275,6 +283,8 @@ required-projects: *required-projects-zed vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-vpnaas-zed @@ -284,6 +294,8 @@ required-projects: *required-projects-zed vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false - job: name: neutron-tempest-plugin-tap-as-a-service-zed @@ -293,3 +305,5 @@ required-projects: *required-projects-zed vars: network_api_extensions_common: *api_extensions + devstack_localrc: + NEUTRON_DEPLOY_MOD_WSGI: false