Merge "Make explicit the network backend used in the CI jobs"

This commit is contained in:
Zuul 2021-06-28 18:55:11 +00:00 committed by Gerrit Code Review
commit 804cc660e7
6 changed files with 73 additions and 43 deletions

@ -93,7 +93,7 @@
zuul_work_dir: src/opendev.org/openstack/neutron zuul_work_dir: src/opendev.org/openstack/neutron
- job: - job:
name: neutron-tempest-plugin-scenario-linuxbridge-nftables name: neutron-linuxbridge-tempest-plugin-scenario-nftables
parent: neutron-tempest-plugin-scenario-linuxbridge parent: neutron-tempest-plugin-scenario-linuxbridge
pre-run: playbooks/install_nftables.yaml pre-run: playbooks/install_nftables.yaml
vars: vars:
@ -104,7 +104,7 @@
enable_ipset: false # Not compatible with nftables enable_ipset: false # Not compatible with nftables
- job: - job:
name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-nftables name: neutron-ovs-tempest-plugin-scenario-iptables_hybrid-nftables
parent: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid parent: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid
pre-run: playbooks/install_nftables.yaml pre-run: playbooks/install_nftables.yaml
vars: vars:

@ -1,5 +1,5 @@
- job: - job:
name: neutron-grenade-multinode name: neutron-ovs-grenade-multinode
parent: grenade-multinode parent: grenade-multinode
required-projects: required-projects:
- openstack/grenade - openstack/grenade
@ -53,8 +53,14 @@
agent: agent:
debug_iptables_rules: True debug_iptables_rules: True
# TODO(ralonsoh): remove this duplicated definition when "devstack" and
# "tempest" adopt the new name.
- job: - job:
name: neutron-grenade-dvr-multinode name: neutron-grenade-multinode
parent: neutron-ovs-grenade-multinode
- job:
name: neutron-ovs-grenade-dvr-multinode
parent: grenade-multinode parent: grenade-multinode
pre-run: playbooks/dvr-multinode-scenario-pre-run.yaml pre-run: playbooks/dvr-multinode-scenario-pre-run.yaml
roles: roles:
@ -143,7 +149,7 @@
debug_iptables_rules: True debug_iptables_rules: True
- job: - job:
name: neutron-grenade-ovn name: neutron-ovn-grenade-multinode
parent: grenade-multinode parent: grenade-multinode
timeout: 9000 timeout: 9000
irrelevant-files: irrelevant-files:

@ -17,17 +17,17 @@
jobs: jobs:
- neutron-functional-with-uwsgi - neutron-functional-with-uwsgi
- neutron-fullstack-with-uwsgi - neutron-fullstack-with-uwsgi
- neutron-rally-task - neutron-ovs-rally-task
- neutron-grenade-multinode - neutron-ovs-grenade-multinode
- neutron-grenade-dvr-multinode: - neutron-ovs-grenade-dvr-multinode:
# TODO(slaweq): make that job voting when bug # TODO(slaweq): make that job voting when bug
# https://bugs.launchpad.net/neutron/+bug/1920778 # https://bugs.launchpad.net/neutron/+bug/1920778
# will be fixed # will be fixed
voting: false voting: false
- neutron-tempest-multinode-full-py3 - neutron-ovs-tempest-multinode-full
- neutron-tempest-dvr-ha-multinode-full - neutron-ovs-tempest-dvr-ha-multinode-full
- neutron-tempest-slow-py3 - neutron-ovs-tempest-slow
- neutron-tempest-ipv6-only - neutron-ovn-tempest-ipv6-only
- neutron-ovn-tempest-ovs-release - neutron-ovn-tempest-ovs-release
- neutron-ovn-tempest-ovs-release-ipv6-only - neutron-ovn-tempest-ovs-release-ipv6-only
# TODO(slaweq): add this job again to the check queue when it will be # TODO(slaweq): add this job again to the check queue when it will be
@ -59,14 +59,14 @@
jobs: jobs:
- neutron-functional-with-uwsgi - neutron-functional-with-uwsgi
- neutron-fullstack-with-uwsgi - neutron-fullstack-with-uwsgi
- neutron-tempest-multinode-full-py3 - neutron-ovs-tempest-multinode-full
- neutron-grenade-multinode - neutron-ovs-grenade-multinode
# TODO(slaweq): make that job gating when bug # TODO(slaweq): make that job gating when bug
# https://bugs.launchpad.net/neutron/+bug/1920778 # https://bugs.launchpad.net/neutron/+bug/1920778
# will be fixed # will be fixed
# - neutron-grenade-dvr-multinode # - neutron-ovs-grenade-dvr-multinode
- neutron-tempest-slow-py3 - neutron-ovs-tempest-slow
- neutron-tempest-ipv6-only - neutron-ovn-tempest-ipv6-only
- neutron-ovn-tempest-ovs-release - neutron-ovn-tempest-ovs-release
- neutron-ovn-tempest-ovs-release-ipv6-only - neutron-ovn-tempest-ovs-release-ipv6-only
- openstack-tox-py36: # from openstack-python3-xena-jobs template - openstack-tox-py36: # from openstack-python3-xena-jobs template
@ -80,21 +80,21 @@
experimental: experimental:
jobs: jobs:
- neutron-grenade-ovn - neutron-ovn-grenade-multinode
- neutron-tempest-with-uwsgi-loki - neutron-ovn-tempest-with-uwsgi-loki
- neutron-ovn-tempest-full-multinode-ovs-master - neutron-ovn-tempest-full-multinode-ovs-master
- neutron-ovn-tempest-ovs-master - neutron-ovn-tempest-ovs-master
- neutron-tempest-with-neutron-lib-master - neutron-ovn-tempest-with-neutron-lib-master
periodic: periodic:
jobs: jobs:
- neutron-functional - neutron-functional
- neutron-fullstack - neutron-fullstack
- neutron-tempest-postgres-full - neutron-ovn-tempest-postgres-full
- neutron-tempest-mariadb-full - neutron-ovn-tempest-mariadb-full
- neutron-tempest-with-os-ken-master - neutron-ovn-tempest-with-os-ken-master
- neutron-ovn-tempest-ovs-master-fedora - neutron-ovn-tempest-ovs-master-fedora
- neutron-tempest-with-neutron-lib-master - neutron-ovn-tempest-with-neutron-lib-master
- devstack-tobiko-faults-centos: - devstack-tobiko-faults-centos:
voting: true voting: true
- ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa - ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa
@ -112,5 +112,5 @@
- neutron-ovn-tripleo-ci-centos-8-containers-multinode: - neutron-ovn-tripleo-ci-centos-8-containers-multinode:
vars: *consumer_vars vars: *consumer_vars
dependencies: *consumer_deps dependencies: *consumer_deps
- neutron-tempest-plugin-scenario-linuxbridge-nftables - neutron-linuxbridge-tempest-plugin-scenario-nftables
- neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid-nftables - neutron-ovs-tempest-plugin-scenario-iptables_hybrid-nftables

@ -1,5 +1,5 @@
- job: - job:
name: neutron-rally-task name: neutron-ovs-rally-task
parent: rally-task-neutron parent: rally-task-neutron
timeout: 10800 timeout: 10800
vars: vars:

@ -1,5 +1,5 @@
- job: - job:
name: neutron-tempest-dvr-ha-multinode-full name: neutron-ovs-tempest-dvr-ha-multinode-full
parent: tempest-multinode-full-py3 parent: tempest-multinode-full-py3
timeout: 10800 timeout: 10800
roles: roles:
@ -144,8 +144,14 @@
availability_zone: nova availability_zone: nova
debug_iptables_rules: True debug_iptables_rules: True
# TODO(ralonsoh): remove this duplicated definition when "devstack",
# "tempest" and "nova" adopt the new name.
- job: - job:
name: neutron-tempest-multinode-full-py3 name: neutron-tempest-dvr-ha-multinode-full
parent: neutron-ovs-tempest-dvr-ha-multinode-full
- job:
name: neutron-ovs-tempest-multinode-full
parent: tempest-multinode-full-py3 parent: tempest-multinode-full-py3
timeout: 10800 timeout: 10800
irrelevant-files: *openvswitch-irrelevant-files irrelevant-files: *openvswitch-irrelevant-files
@ -218,7 +224,7 @@
debug_iptables_rules: True debug_iptables_rules: True
- job: - job:
name: neutron-tempest-slow-py3 name: neutron-ovs-tempest-slow
parent: tempest-slow-py3 parent: tempest-slow-py3
timeout: 10800 timeout: 10800
irrelevant-files: *openvswitch-irrelevant-files irrelevant-files: *openvswitch-irrelevant-files

@ -47,7 +47,7 @@
debug_iptables_rules: True debug_iptables_rules: True
- job: - job:
name: neutron-ovs-base name: neutron-ovs-tempest-base
description: Base job for tempest to test Neutron with ML2/OVS driver description: Base job for tempest to test Neutron with ML2/OVS driver
parent: neutron-tempest-base parent: neutron-tempest-base
vars: vars:
@ -72,8 +72,8 @@
- ^neutron/plugins/ml2/drivers/ovn/.*$ - ^neutron/plugins/ml2/drivers/ovn/.*$
- job: - job:
name: neutron-tempest-dvr name: neutron-ovs-tempest-dvr
parent: neutron-ovs-base parent: neutron-ovs-tempest-base
vars: vars:
devstack_localrc: devstack_localrc:
Q_DVR_MODE: dvr_snat Q_DVR_MODE: dvr_snat
@ -81,8 +81,14 @@
br-ex-tcpdump: true br-ex-tcpdump: true
br-int-flows: true br-int-flows: true
# TODO(ralonsoh): remove this duplicated definition when "devstack",
# "tempest" and "nova" adopt the new name.
- job: - job:
name: neutron-tempest-linuxbridge name: neutron-tempest-dvr
parent: neutron-ovs-tempest-dvr
- job:
name: neutron-linuxbridge-tempest
parent: neutron-tempest-base parent: neutron-tempest-base
vars: vars:
devstack_localrc: devstack_localrc:
@ -106,9 +112,15 @@
- ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$
- ^neutron/plugins/ml2/drivers/ovn/.*$ - ^neutron/plugins/ml2/drivers/ovn/.*$
# TODO(ralonsoh): remove this duplicated definition when "devstack" and "nova"
# adopt the new name.
- job: - job:
name: neutron-tempest-iptables_hybrid name: neutron-tempest-linuxbridge
parent: neutron-ovs-base parent: neutron-linuxbridge-tempest
- job:
name: neutron-ovs-tempest-iptables_hybrid
parent: neutron-ovs-tempest-base
vars: vars:
devstack_plugins: devstack_plugins:
neutron: https://opendev.org/openstack/neutron.git neutron: https://opendev.org/openstack/neutron.git
@ -157,8 +169,14 @@
image_is_advanced: true image_is_advanced: true
available_type_drivers: flat,geneve,vlan,gre,local,vxlan available_type_drivers: flat,geneve,vlan,gre,local,vxlan
# TODO(ralonsoh): remove this duplicated definition when "nova" adopts the
# new name.
- job: - job:
name: neutron-tempest-postgres-full name: neutron-tempest-iptables_hybrid
parent: neutron-ovs-tempest-iptables_hybrid
- job:
name: neutron-ovn-tempest-postgres-full
parent: tempest-integrated-networking parent: tempest-integrated-networking
timeout: 10800 timeout: 10800
required-projects: required-projects:
@ -198,7 +216,7 @@
- ^neutron/plugins/ml2/drivers/.*$ - ^neutron/plugins/ml2/drivers/.*$
- job: - job:
name: neutron-tempest-mariadb-full name: neutron-ovn-tempest-mariadb-full
parent: tempest-integrated-networking parent: tempest-integrated-networking
timeout: 10800 timeout: 10800
required-projects: required-projects:
@ -229,7 +247,7 @@
irrelevant-files: *tempest-db-irrelevant-files irrelevant-files: *tempest-db-irrelevant-files
- job: - job:
name: neutron-tempest-with-os-ken-master name: neutron-ovn-tempest-with-os-ken-master
parent: tempest-integrated-networking parent: tempest-integrated-networking
timeout: 10800 timeout: 10800
required-projects: required-projects:
@ -270,7 +288,7 @@
- ^neutron/plugins/ml2/drivers/mech_sriov/.*$ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$
- job: - job:
name: neutron-tempest-with-neutron-lib-master name: neutron-ovn-tempest-with-neutron-lib-master
parent: tempest-integrated-networking parent: tempest-integrated-networking
timeout: 10800 timeout: 10800
required-projects: required-projects:
@ -296,7 +314,7 @@
s-proxy: false s-proxy: false
- job: - job:
name: neutron-tempest-with-uwsgi name: neutron-ovn-tempest-with-uwsgi
parent: tempest-integrated-networking parent: tempest-integrated-networking
description: Run neutron Tempest tests with uwsgi description: Run neutron Tempest tests with uwsgi
timeout: 10800 timeout: 10800
@ -337,7 +355,7 @@
- ^vagrant/.*$ - ^vagrant/.*$
- job: - job:
name: neutron-tempest-with-uwsgi-loki name: neutron-ovn-tempest-with-uwsgi-loki
parent: neutron-tempest-with-uwsgi parent: neutron-tempest-with-uwsgi
timeout: 10800 timeout: 10800
vars: vars:
@ -454,7 +472,7 @@
- ^neutron/scheduler/.*$ - ^neutron/scheduler/.*$
- job: - job:
name: neutron-tempest-ipv6-only name: neutron-ovn-tempest-ipv6-only
parent: tempest-ipv6-only parent: tempest-ipv6-only
timeout: 10800 timeout: 10800
vars: vars: