Remove all eventlet Neutron API jobs
The Neutron API WSGI module will be the only one available in
devstack [1].
[1]https://review.opendev.org/c/openstack/devstack/+/932203
Topic: eventlet-deprecation
Related-Bug: #2069831
Change-Id: I38d64650ae1115870a38641c1f199b09838f4bd7
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 885e370..a7a3e2e 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -37,7 +37,7 @@
BUILD_TIMEOUT: 784
# TODO(lucasagomes): Re-enable MOD_WSGI after
# https://bugs.launchpad.net/neutron/+bug/1912359 is implemented
- NEUTRON_DEPLOY_MOD_WSGI: false
+ 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
@@ -261,7 +261,6 @@
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,7 +376,6 @@
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:
@@ -460,7 +458,6 @@
vars:
devstack_localrc:
NEUTRON_ENFORCE_SCOPE: false
- NEUTRON_DEPLOY_MOD_WSGI: true
- job:
name: neutron-tempest-plugin-openvswitch-distributed-dhcp
@@ -645,7 +642,6 @@
OVN_DBS_LOG_LEVEL: dbg
ENABLE_TLS: True
OVN_IGMP_SNOOPING_ENABLE: True
- NEUTRON_DEPLOY_MOD_WSGI: true
devstack_services:
br-ex-tcpdump: true
br-int-flows: true
@@ -784,22 +780,6 @@
devstack_localrc:
NEUTRON_DEPLOY_MOD_WSGI: true
-- job: # To be tested temporarily in the periodic queue
- name: neutron-tempest-plugin-api-ovs-eventlet
- parent: neutron-tempest-plugin-openvswitch
- voting: false
- vars:
- devstack_localrc:
- NEUTRON_DEPLOY_MOD_WSGI: false
-
-- job: # To be tested temporarily in the periodic queue
- name: neutron-tempest-plugin-api-ovn-eventlet
- parent: neutron-tempest-plugin-ovn
- voting: false
- vars:
- devstack_localrc:
- NEUTRON_DEPLOY_MOD_WSGI: false
-
- job:
name: neutron-tempest-plugin-dvr-multinode-scenario
parent: tempest-multinode-full
@@ -1053,7 +1033,6 @@
# empty
ADVANCED_IMAGE_NAME: ""
NETWORK_API_EXTENSIONS: "{{ network_api_extensions_common | join(',') }}"
- NEUTRON_DEPLOY_MOD_WSGI: true
devstack_plugins:
designate: https://opendev.org/openstack/designate.git
devstack_services:
@@ -1174,7 +1153,6 @@
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
@@ -1256,7 +1234,6 @@
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
@@ -1390,7 +1367,6 @@
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
@@ -1470,7 +1446,6 @@
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
@@ -1625,7 +1600,6 @@
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/project.yaml b/zuul.d/project.yaml
index e27910c..ee75bf4 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -24,8 +24,6 @@
- neutron-tempest-plugin-dvr-multinode-scenario
- neutron-tempest-plugin-openvswitch-distributed-dhcp
- neutron-tempest-plugin-openvswitch-iptables_hybrid-distributed-dhcp
- - neutron-tempest-plugin-api-ovs-eventlet
- - neutron-tempest-plugin-api-ovn-eventlet
- neutron-tempest-plugin-ovn-enforce-scope-old-defaults
periodic:
jobs: