openstack/neutron
Code Issues Proposed changes

Remove all eventlet Neutron API jobs

Browse Source 
The Neutron API WSGI module will be the only one available in
devstack [1].

[1]https://review.opendev.org/c/openstack/devstack/+/932203

Depends-On: https://review.opendev.org/c/openstack/devstack/+/935625

Topic: eventlet-deprecation
Related-Bug: #2069831
Change-Id: Ib7b1a0b80b766b2378b183de282b09c639e8d144
This commit is contained in:
Rodolfo Alonso Hernandez 2024-11-19 10:52:21 +00:00
parent 3441c96fc4
commit 0415d3a41a
5 changed files with 29 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/contributor/testing/ci_scenario_jobs.rst
View File

@ -120,7 +120,7 @@ Currently we have in that queue jobs like listed below.
| Job name | Run tests | nodes | Operating system | L2 agent | firewall | L3 agent | L3 HA | L3 DVR | enable_dvr | Run in gate |
| | | | | | driver | mode | | | | queue |
+==============================================+==================================+=======+==================+=============+=================+==========+=======+========+============+=============+
|neutron-ovn-tempest-with-uwsgi-loki |tempest.api (without slow tests) | 1 | Ubuntu Jammy | ovn | ovn | --- | --- | --- | --- | No |
|neutron-ovn-tempest-loki |tempest.api (without slow tests) | 1 | Ubuntu Jammy | ovn | ovn | --- | --- | --- | --- | No |
|(non-voting) |tempest.scenario | | | | | | | | | |
| |(only tests related to | | | | | | | | | |
| |Neutron and Nova) | | | | | | | | | |

50
zuul.d/base.yaml
View File

@ -55,7 +55,7 @@
devstack_localrc:
INSTALL_TESTONLY_PACKAGES: true
DATABASE_PASSWORD: stackdb
NEUTRON_DEPLOY_MOD_WSGI: false
NEUTRON_DEPLOY_MOD_WSGI: true
tox_envlist: dsvm-functional-gate
tox_constraints_file: '{{ ansible_user_dir }}/src/opendev.org/openstack/requirements/upper-constraints.txt'
zuul_copy_output:
@ -63,6 +63,12 @@
# /opt/stack/logs is default logs directory defined in neutron's
# tox.ini file
'/opt/stack/logs/dsvm-functional-logs.tar.gz': logs
# Because this job uses neutron defined tox env (defined in base job),
# we need to set zuul_work_dir to neutron so that it can be used by
# other projects. Currently devstack run this job. Not setting this
# in base neutron-functional job as that is being used by neutron
# stadium projects where they need to use stadium project as working dir.
zuul_work_dir: src/opendev.org/openstack/neutron
- job:
name: neutron-fullstack
@ -117,22 +123,9 @@
- ^zuul.d/tempest-singlenode.yaml
- job:
name: neutron-fullstack-with-uwsgi
parent: neutron-fullstack
vars:
devstack_localrc:
NEUTRON_DEPLOY_MOD_WSGI: true
# Because this job uses neutron defined tox env (defined in base job),
# we need to set zuul_work_dir to neutron so that it can be used by
# other projects. Currently devstack run this job. Not setting this
# in base neutron-functional job as that is being used by neutron
# stadium projects where they need to use stadium project as working dir.
zuul_work_dir: src/opendev.org/openstack/neutron
- job:
name: neutron-fullstack-with-uwsgi-with-neutron-lib-master
name: neutron-fullstack-with-neutron-lib-master
branches: ^master$
parent: neutron-fullstack-with-uwsgi
parent: neutron-fullstack
required-projects:
- openstack/neutron-lib
@ -144,28 +137,15 @@
- name: github.com/svinota/pyroute2
- job:
name: neutron-functional-with-uwsgi
parent: neutron-functional
vars:
devstack_localrc:
NEUTRON_DEPLOY_MOD_WSGI: true
# Because this job uses neutron defined tox env (defined in base job),
# we need to set zuul_work_dir to neutron so that it can be used by
# other projects. Currently devstack run this job. Not setting this
# in base neutron-functional job as that is being used by neutron
# stadium projects where they need to use stadium project as working dir.
zuul_work_dir: src/opendev.org/openstack/neutron
- job:
name: neutron-functional-with-uwsgi-with-neutron-lib-master
name: neutron-functional-with-neutron-lib-master
branches: ^master$
parent: neutron-functional-with-uwsgi
parent: neutron-functional
required-projects:
- openstack/neutron-lib
- job:
name: neutron-functional-with-uwsgi-fips
parent: neutron-functional-with-uwsgi
name: neutron-functional-fips
parent: neutron-functional
nodeset: devstack-single-node-centos-9-stream
description: |
Functional testing for a FIPS enabled Centos 9 system
@ -249,8 +229,8 @@
override-checkout: main
- job:
name: neutron-fullstack-with-uwsgi-fips
parent: neutron-fullstack-with-uwsgi
name: neutron-fullstack-fips
parent: neutron-fullstack
nodeset: devstack-single-node-centos-9-stream
description: |
Functional testing for a FIPS enabled Centos 9 system

12
zuul.d/job-templates.yaml
View File

@ -68,11 +68,11 @@
name: neutron-experimental-jobs
experimental:
jobs:
- neutron-functional-with-uwsgi-with-neutron-lib-master
- neutron-fullstack-with-uwsgi-with-neutron-lib-master
- neutron-functional-with-neutron-lib-master
- neutron-fullstack-with-neutron-lib-master
- neutron-ovn-tempest-ovs-release
- neutron-ovs-tempest-with-neutron-lib-master
- neutron-ovn-tempest-with-uwsgi-loki
- neutron-ovn-tempest-loki
# Jobs added to the periodic queue by templates defined in
# https://opendev.org/openstack/openstack-zuul-jobs/src/branch/master/zuul.d/project-templates.yaml
- openstack-tox-py312-with-neutron-lib-master:
@ -90,11 +90,11 @@
periodic:
jobs: &neutron-periodic-jobs
- neutron-functional
- neutron-functional-with-uwsgi-fips
- neutron-functional-fips
- neutron-functional-with-pyroute2-master
- neutron-functional-with-sqlalchemy-master
- neutron-fullstack
- neutron-fullstack-with-uwsgi-fips
- neutron-fullstack-fips
- neutron-fullstack-with-pyroute2-master
- neutron-ovs-grenade-dvr-multinode
- neutron-ovs-tempest-slow
@ -131,8 +131,6 @@
- neutron-ovs-tempest-with-oslo-master
- neutron-ovn-tempest-ovs-release-with-oslo-master
- neutron-tempest-plugin-linuxbridge
- neutron-tempest-plugin-api-ovs-eventlet
- neutron-tempest-plugin-api-ovn-eventlet
experimental:
jobs: *neutron-periodic-jobs

8
zuul.d/project.yaml
View File

@ -18,8 +18,8 @@
- neutron-skip-level-jobs
check:
jobs:
- neutron-functional-with-uwsgi
- neutron-fullstack-with-uwsgi
- neutron-functional
- neutron-fullstack
- neutron-ovs-grenade-multinode
- neutron-ovn-grenade-multinode
- neutron-ovs-tempest-multinode-full
@ -72,8 +72,8 @@
gate:
jobs:
- neutron-functional-with-uwsgi
- neutron-fullstack-with-uwsgi
- neutron-functional
- neutron-fullstack
- neutron-ovs-tempest-multinode-full
- neutron-ovn-grenade-multinode
- neutron-ovs-grenade-multinode

9
zuul.d/tempest-singlenode.yaml
View File

@ -16,7 +16,7 @@
CIRROS_VERSION: 0.6.2
DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-uec
DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-uec.tar.gz
NEUTRON_DEPLOY_MOD_WSGI: false
NEUTRON_DEPLOY_MOD_WSGI: true
devstack_plugins:
neutron: https://opendev.org/openstack/neutron.git
devstack_services:
@ -58,7 +58,6 @@
devstack_localrc:
Q_AGENT: openvswitch
Q_ML2_PLUGIN_MECHANISM_DRIVERS: openvswitch
NEUTRON_DEPLOY_MOD_WSGI: true
irrelevant-files: &openvswitch-irrelevant-files
- ^\.pre-commit-config\.yaml$
- ^\.pylintrc$
@ -425,7 +424,7 @@
- openstack/pbr
- job:
name: neutron-ovn-tempest-with-uwsgi
name: neutron-ovn-tempest
parent: tempest-integrated-networking
description: Run neutron Tempest tests with uwsgi
timeout: 10800
@ -488,8 +487,8 @@
- ^zuul.d/tempest-singlenode.yaml
- job:
name: neutron-ovn-tempest-with-uwsgi-loki
parent: neutron-ovn-tempest-with-uwsgi
name: neutron-ovn-tempest-loki
parent: neutron-ovn-tempest
timeout: 10800
vars:
devstack_services: