Merge "Add Active Active L3 GW scenario test cases"
diff --git a/doc/requirements.txt b/doc/requirements.txt
index 6fe7c34..12d5b68 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,4 +1,4 @@
reno>=3.1.0 # Apache-2.0
-sphinx>=2.0.0,!=2.1.0 # BSD
+sphinx>=2.2.0 # BSD
openstackdocstheme>=2.2.1 # Apache-2.0
diff --git a/requirements.txt b/requirements.txt
index 9423079..957f186 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,14 +1,10 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
-pbr!=2.1.0,>=2.0.0 # Apache-2.0
+pbr>=3.0.0 # Apache-2.0
neutron-lib>=1.25.0 # Apache-2.0
oslo.config>=5.2.0 # Apache-2.0
netaddr>=0.7.18 # BSD
os-ken>=0.3.0 # Apache-2.0
oslo.log>=3.36.0 # Apache-2.0
-oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
+oslo.serialization>=2.20.0 # Apache-2.0
oslo.utils>=3.33.0 # Apache-2.0
packaging>=20.4 # Apache-2.0
paramiko>=2.0.0 # LGPLv2.1+
@@ -16,5 +12,5 @@
tenacity>=3.2.1 # Apache-2.0
ddt>=1.0.1 # MIT
testtools>=2.2.0 # MIT
-eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
+eventlet>=0.21.0 # MIT
debtcollector>=1.2.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index f5bac7c..0151f21 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,10 +1,6 @@
-# The order of packages is significant, because pip processes them in the order
-# of appearance. Changing the order has an impact on the overall integration
-# process, which may cause wedges in the gate later.
-
hacking>=3.2.0,<3.3.0 # Apache-2.0
-coverage!=4.4,>=4.0 # Apache-2.0
+coverage>=4.4.1 # Apache-2.0
flake8-import-order==0.12 # LGPLv3
python-subunit>=1.0.0 # Apache-2.0/BSD
oslotest>=3.2.0 # Apache-2.0
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 2b7cc88..4824424 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -218,7 +218,17 @@
- ^roles/.*functional.*$
- ^playbooks/.*functional.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
- job:
name: neutron-tempest-plugin-openvswitch
@@ -314,7 +324,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
- job:
name: neutron-tempest-plugin-openvswitch-iptables_hybrid
@@ -419,7 +439,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
- job:
name: neutron-tempest-plugin-openvswitch-enforce-scope-old-defaults
@@ -584,7 +614,17 @@
- ^playbooks/.*dynamic-routing.*$
- ^playbooks/.*functional.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
# TODO(slaweq): remove that job's definition as soon as new job
# "neutron-tempest-plugin-linuxbridge" will be used in the neutron repo as
@@ -726,7 +766,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
# TODO(slaweq): remove that job's definition as soon as new job
# "neutron-tempest-plugin-ovn" will be used in the neutron-lib repo as
@@ -736,6 +786,22 @@
parent: neutron-tempest-plugin-ovn
- job:
+ name: neutron-tempest-plugin-api-ovs-wsgi
+ parent: neutron-tempest-plugin-openvswitch
+ voting: false
+ vars:
+ devstack_localrc:
+ NEUTRON_DEPLOY_MOD_WSGI: true
+
+- job:
+ name: neutron-tempest-plugin-api-ovn-wsgi
+ parent: neutron-tempest-plugin-ovn
+ voting: false
+ vars:
+ devstack_localrc:
+ NEUTRON_DEPLOY_MOD_WSGI: true
+
+- job:
name: neutron-tempest-plugin-dvr-multinode-scenario
parent: tempest-multinode-full
description: |
@@ -956,7 +1022,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
- job:
name: neutron-tempest-plugin-designate-scenario
@@ -1005,7 +1081,7 @@
- ^neutron/privileged/.*$
- ^neutron/plugins/ml2/drivers/.*$
- ^neutron/scheduler/.*$
- - ^neutron/services/(?!externaldns).*$
+ - ^neutron/services/.*$
- ^neutron_tempest_plugin/api/test_.*$
- ^neutron_tempest_plugin/(bgpvpn|fwaas|neutron_dynamic_routing|sfc|tap_as_a_service|vpnaas).*$
- ^neutron_tempest_plugin/services/bgp/.*$
@@ -1016,7 +1092,40 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for neutron/services/externaldns/
+ - ^neutron/services/auto_allocate/.*$
+ - ^neutron/services/conntrack_helper/.*$
+ - ^neutron/services/firewall/.*$
+ - ^neutron/services/flavors/.*$
+ - ^neutron/services/l3_router/.*$
+ - ^neutron/services/local_ip/.*$
+ - ^neutron/services/logapi/.*$
+ - ^neutron/services/loki/.*$
+ - ^neutron/services/metering/.*$
+ - ^neutron/services/ndp_proxy/.*$
+ - ^neutron/services/network_ip_availability/.*$
+ - ^neutron/services/network_segment_range/.*$
+ - ^neutron/services/ovn_l3/.*$
+ - ^neutron/services/placement_report/.*$
+ - ^neutron/services/portforwarding/.*$
+ - ^neutron/services/qos/.*$
+ - ^neutron/services/rbac/.*$
+ - ^neutron/services/revisions/.*$
+ - ^neutron/services/segments/.*$
+ - ^neutron/services/tag/.*$
+ - ^neutron/services/timestamp/.*$
+ - ^neutron/services/trunk/.*$
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
- job:
name: neutron-tempest-plugin-sfc
@@ -1092,7 +1201,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
- job:
name: neutron-tempest-plugin-bgpvpn-bagpipe
@@ -1160,7 +1279,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
- job:
name: neutron-tempest-plugin-dynamic-routing
@@ -1214,14 +1343,23 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
- job:
name: neutron-tempest-plugin-fwaas
parent: neutron-tempest-plugin-base
timeout: 10800
required-projects:
- - openstack/devstack-gate
- openstack/neutron-fwaas
- openstack/neutron
- openstack/neutron-tempest-plugin
@@ -1280,7 +1418,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
- job:
name: neutron-tempest-plugin-vpnaas
@@ -1349,7 +1497,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
- job:
name: neutron-tempest-plugin-vpnaas-ovn
@@ -1409,7 +1567,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
- job:
name: neutron-tempest-plugin-tap-as-a-service
@@ -1419,7 +1587,6 @@
roles:
- zuul: openstack/devstack
required-projects:
- - openstack/devstack-gate
- openstack/neutron
- openstack/neutron-tempest-plugin
- openstack/tap-as-a-service
@@ -1519,4 +1686,14 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - ^zuul.d/(?!(project)).*\.yaml
+ # Ignore everything except for zuul.d/project.yaml
+ - ^zuul.d/2023_1_jobs.yaml
+ - ^zuul.d/2023_2_jobs.yaml
+ - ^zuul.d/2024_1_jobs.yaml
+ - ^zuul.d/base-nested-switch.yaml
+ - ^zuul.d/master_jobs.yaml
+ - ^zuul.d/victoria_jobs.yaml
+ - ^zuul.d/wallaby_jobs.yaml
+ - ^zuul.d/xena_jobs.yaml
+ - ^zuul.d/yoga_jobs.yaml
+ - ^zuul.d/zed_jobs.yaml
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 04f5f79..79762cd 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -21,6 +21,8 @@
- 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-wsgi
+ - neutron-tempest-plugin-api-ovn-wsgi
- project-template:
@@ -185,7 +187,10 @@
- release-notes-jobs-python3
check:
jobs:
- - neutron-tempest-plugin-sfc
+ - neutron-tempest-plugin-sfc:
+ # Note(lajoskatona): make it voting when #2068727
+ # is fixed.
+ voting: false
- neutron-tempest-plugin-sfc-2023-1
- neutron-tempest-plugin-sfc-2023-2
- neutron-tempest-plugin-sfc-2024-1
@@ -213,7 +218,6 @@
gate:
jobs:
- - neutron-tempest-plugin-sfc
- neutron-tempest-plugin-bgpvpn-bagpipe
- neutron-tempest-plugin-dynamic-routing
- neutron-tempest-plugin-fwaas
diff --git a/zuul.d/zed_jobs.yaml b/zuul.d/zed_jobs.yaml
index 7d8b2e1..b002218 100644
--- a/zuul.d/zed_jobs.yaml
+++ b/zuul.d/zed_jobs.yaml
@@ -1,8 +1,13 @@
- job:
name: neutron-tempest-plugin-openvswitch-zed
parent: neutron-tempest-plugin-openvswitch
- override-checkout: stable/zed
+ override-checkout: unmaintained/zed
nodeset: neutron-nested-virt-ubuntu-focal
+ required-projects: &required-projects-zed
+ - openstack/neutron
+ - name: openstack/neutron-tempest-plugin
+ override-checkout: zed-last
+ - openstack/tempest
vars:
network_api_extensions_openvswitch:
- local_ip
@@ -106,7 +111,8 @@
- job:
name: neutron-tempest-plugin-openvswitch-iptables_hybrid-zed
parent: neutron-tempest-plugin-openvswitch-iptables_hybrid
- override-checkout: stable/zed
+ override-checkout: unmaintained/zed
+ required-projects: *required-projects-zed
nodeset: neutron-nested-virt-ubuntu-focal
vars:
network_api_extensions_common: *api_extensions
@@ -140,7 +146,8 @@
- job:
name: neutron-tempest-plugin-linuxbridge-zed
parent: neutron-tempest-plugin-linuxbridge
- override-checkout: stable/zed
+ override-checkout: unmaintained/zed
+ required-projects: *required-projects-zed
nodeset: neutron-nested-virt-ubuntu-focal
vars:
network_api_extensions_common: *api_extensions
@@ -168,7 +175,8 @@
- job:
name: neutron-tempest-plugin-ovn-zed
parent: neutron-tempest-plugin-ovn
- override-checkout: stable/zed
+ override-checkout: unmaintained/zed
+ required-projects: *required-projects-zed
nodeset: neutron-nested-virt-ubuntu-focal
vars:
tempest_test_regex: "\
@@ -196,14 +204,16 @@
name: neutron-tempest-plugin-dvr-multinode-scenario-zed
parent: neutron-tempest-plugin-dvr-multinode-scenario
nodeset: openstack-two-node-focal
- override-checkout: stable/zed
+ override-checkout: unmaintained/zed
+ required-projects: *required-projects-zed
vars:
network_api_extensions_common: *api_extensions
- job:
name: neutron-tempest-plugin-designate-scenario-zed
parent: neutron-tempest-plugin-designate-scenario
- override-checkout: stable/zed
+ override-checkout: unmaintained/zed
+ required-projects: *required-projects-zed
nodeset: neutron-nested-virt-ubuntu-focal
vars:
network_api_extensions_common: *api_extensions
@@ -212,7 +222,8 @@
name: neutron-tempest-plugin-sfc-zed
parent: neutron-tempest-plugin-sfc
nodeset: openstack-single-node-focal
- override-checkout: stable/zed
+ override-checkout: unmaintained/zed
+ required-projects: *required-projects-zed
vars:
network_api_extensions_common: *api_extensions
@@ -220,7 +231,8 @@
name: neutron-tempest-plugin-bgpvpn-bagpipe-zed
parent: neutron-tempest-plugin-bgpvpn-bagpipe
nodeset: openstack-single-node-focal
- override-checkout: stable/zed
+ override-checkout: unmaintained/zed
+ required-projects: *required-projects-zed
vars:
network_api_extensions: *api_extensions
@@ -228,7 +240,8 @@
name: neutron-tempest-plugin-dynamic-routing-zed
parent: neutron-tempest-plugin-dynamic-routing
nodeset: openstack-single-node-focal
- override-checkout: stable/zed
+ override-checkout: unmaintained/zed
+ required-projects: *required-projects-zed
vars:
network_api_extensions_common: *api_extensions
devstack_localrc:
@@ -258,7 +271,8 @@
name: neutron-tempest-plugin-fwaas-zed
parent: neutron-tempest-plugin-fwaas
nodeset: openstack-single-node-focal
- override-checkout: stable/zed
+ override-checkout: unmaintained/zed
+ required-projects: *required-projects-zed
vars:
network_api_extensions_common: *api_extensions
@@ -266,7 +280,8 @@
name: neutron-tempest-plugin-vpnaas-zed
parent: neutron-tempest-plugin-vpnaas
nodeset: openstack-single-node-focal
- override-checkout: stable/zed
+ override-checkout: unmaintained/zed
+ required-projects: *required-projects-zed
vars:
network_api_extensions_common: *api_extensions
@@ -274,6 +289,7 @@
name: neutron-tempest-plugin-tap-as-a-service-zed
parent: neutron-tempest-plugin-tap-as-a-service
nodeset: openstack-single-node-focal
- override-checkout: stable/zed
+ override-checkout: unmaintained/zed
+ required-projects: *required-projects-zed
vars:
network_api_extensions_common: *api_extensions