Merge "Revert "Temporary turn off l3_ha in ovs/lb master/bobcat jobs""
diff --git a/playbooks/linuxbridge-scenario-pre-run.yaml b/playbooks/linuxbridge-scenario-pre-run.yaml
index 26586f6..bc80e76 100644
--- a/playbooks/linuxbridge-scenario-pre-run.yaml
+++ b/playbooks/linuxbridge-scenario-pre-run.yaml
@@ -4,4 +4,4 @@
# destination IP addresses in arp tables:
- include_role:
name: legacy_ebtables
- when: ansible_distribution_release | lower == 'focal'
+ when: ansible_distribution_release | lower in ['focal', 'jammy']
diff --git a/zuul.d/base-nested-switch.yaml b/zuul.d/base-nested-switch.yaml
index f407d8f..b4570fe 100644
--- a/zuul.d/base-nested-switch.yaml
+++ b/zuul.d/base-nested-switch.yaml
@@ -23,13 +23,17 @@
name: neutron-tempest-plugin-base-nested-switch
parent: neutron-tempest-plugin-base
abstract: true
- branches: ^(?!stable/(train|ussuri|victoria|wallaby|xena|yoga|zed)).*$
+ branches:
+ regex: ^(stable/(train|ussuri|victoria|wallaby|xena|yoga|zed)).*$
+ negate: true
# Comment nodeset and vars to switch back to non nested nodes
nodeset: neutron-nested-virt-ubuntu-jammy
vars: &nested_virt_vars
devstack_localrc:
LIBVIRT_TYPE: kvm
- LIBVIRT_CPU_MODE: host-passthrough
+ # NOTE(ykarel): seeing issues with host-passthrough mode
+ # https://bugs.launchpad.net/neutron/+bug/2036603
+ # LIBVIRT_CPU_MODE: host-passthrough
CIRROS_VERSION: 0.6.2
DEFAULT_IMAGE_NAME: cirros-0.6.2-x86_64-disk
DEFAULT_IMAGE_FILE_NAME: cirros-0.6.2-x86_64-disk.img
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 97b5759..58fc684 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -270,7 +270,7 @@
neutron_plugin_options:
available_type_drivers: flat,vlan,local,vxlan
firewall_driver: openvswitch
- irrelevant-files: &openvswitch-scenario-irrelevant-files
+ irrelevant-files:
- ^\.pylintrc$
- ^(test-|)requirements.txt$
- lower-constraints.txt
@@ -305,7 +305,10 @@
- ^neutron_tempest_plugin/services/bgp/.*$
- ^rally-jobs/.*$
- ^roles/.*functional.*$
+ - ^playbooks/.*dvr-multinode.*$
+ - ^playbooks/.*dynamic-routing.*$
- ^playbooks/.*functional.*$
+ - ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- ^zuul.d/(?!(project)).*\.yaml
@@ -406,7 +409,10 @@
- ^neutron_tempest_plugin/services/bgp/.*$
- ^rally-jobs/.*$
- ^roles/.*functional.*$
+ - ^playbooks/.*dvr-multinode.*$
+ - ^playbooks/.*dynamic-routing.*$
- ^playbooks/.*functional.*$
+ - ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- ^zuul.d/(?!(project)).*\.yaml
@@ -578,6 +584,8 @@
- ^neutron_tempest_plugin/services/bgp/.*$
- ^rally-jobs/.*$
- ^roles/.*functional.*$
+ - ^playbooks/.*dvr-multinode.*$
+ - ^playbooks/.*dynamic-routing.*$
- ^playbooks/.*functional.*$
- ^vagrant/.*$
- ^zuul.d/(?!(project)).*\.yaml
@@ -710,7 +718,10 @@
- ^neutron_tempest_plugin/services/bgp/.*$
- ^rally-jobs/.*$
- ^roles/.*functional.*$
+ - ^playbooks/.*dvr-multinode.*$
+ - ^playbooks/.*dynamic-routing.*$
- ^playbooks/.*functional.*$
+ - ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- ^zuul.d/(?!(project)).*\.yaml
@@ -903,7 +914,46 @@
agent_mode: dvr_snat
agent:
availability_zone: nova
- irrelevant-files: *openvswitch-scenario-irrelevant-files
+ irrelevant-files:
+ - ^\.pylintrc$
+ - ^(test-|)requirements.txt$
+ - lower-constraints.txt
+ - ^releasenotes/.*$
+ - ^doc/.*$
+ - ^setup.cfg$
+ - ^.*\.rst$
+ - ^.*\.conf\.sample$
+ - ^neutron/locale/.*$
+ - ^neutron/tests/unit/.*$
+ - ^neutron/tests/fullstack/.*
+ - ^neutron/tests/functional/.*
+ - ^tools/.*$
+ - ^tox.ini$
+ - ^plugin.spec$
+ - ^neutron/agent/ovn/.*$
+ - ^neutron/agent/windows/.*$
+ - ^neutron/plugins/ml2/drivers/linuxbridge/.*$
+ - ^neutron/plugins/ml2/drivers/macvtap/.*$
+ - ^neutron/plugins/ml2/drivers/mech_sriov/.*$
+ - ^neutron/plugins/ml2/drivers/ovn/.*$
+ - ^neutron/services/ovn_l3/.*$
+ - ^neutron/services/logapi/drivers/ovn/.*$
+ - ^neutron/services/portforwarding/drivers/ovn/.*$
+ - ^neutron/services/qos/drivers/linuxbridge/.*$
+ - ^neutron/services/qos/drivers/ovn/.*$
+ - ^neutron/services/trunk/drivers/linuxbridge/.*$
+ - ^neutron/services/trunk/drivers/ovn/.*$
+ - ^neutron/cmd/ovn/.*$
+ - ^neutron/common/ovn/.*$
+ - ^neutron_tempest_plugin/(bgpvpn|fwaas|neutron_dynamic_routing|sfc|tap_as_a_service|vpnaas).*$
+ - ^neutron_tempest_plugin/services/bgp/.*$
+ - ^rally-jobs/.*$
+ - ^roles/.*functional.*$
+ - ^playbooks/.*dynamic-routing.*$
+ - ^playbooks/.*functional.*$
+ - ^playbooks/.*linuxbridge.*$
+ - ^vagrant/.*$
+ - ^zuul.d/(?!(project)).*\.yaml
- job:
name: neutron-tempest-plugin-designate-scenario
@@ -958,7 +1008,10 @@
- ^neutron_tempest_plugin/services/bgp/.*$
- ^rally-jobs/.*$
- ^roles/.*functional.*$
+ - ^playbooks/.*dvr-multinode.*$
+ - ^playbooks/.*dynamic-routing.*$
- ^playbooks/.*functional.*$
+ - ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- ^zuul.d/(?!(project)).*\.yaml
@@ -1031,7 +1084,10 @@
- ^plugin.spec$
- ^rally-jobs/.*$
- ^roles/.*functional.*$
+ - ^playbooks/.*dvr-multinode.*$
+ - ^playbooks/.*dynamic-routing.*$
- ^playbooks/.*functional.*$
+ - ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- ^zuul.d/(?!(project)).*\.yaml
@@ -1096,7 +1152,10 @@
- ^plugin.spec$
- ^rally-jobs/.*$
- ^roles/.*functional.*$
+ - ^playbooks/.*dvr-multinode.*$
+ - ^playbooks/.*dynamic-routing.*$
- ^playbooks/.*functional.*$
+ - ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- ^zuul.d/(?!(project)).*\.yaml
@@ -1148,7 +1207,9 @@
- ^plugin.spec$
- ^rally-jobs/.*$
- ^roles/.*functional.*$
+ - ^playbooks/.*dvr-multinode.*$
- ^playbooks/.*functional.*$
+ - ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- ^zuul.d/(?!(project)).*\.yaml
@@ -1211,7 +1272,10 @@
- ^plugin.spec$
- ^rally-jobs/.*$
- ^roles/.*functional.*$
+ - ^playbooks/.*dvr-multinode.*$
+ - ^playbooks/.*dynamic-routing.*$
- ^playbooks/.*functional.*$
+ - ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- ^zuul.d/(?!(project)).*\.yaml
@@ -1277,7 +1341,10 @@
- ^plugin.spec$
- ^rally-jobs/.*$
- ^roles/.*functional.*$
+ - ^playbooks/.*dvr-multinode.*$
+ - ^playbooks/.*dynamic-routing.*$
- ^playbooks/.*functional.*$
+ - ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- ^zuul.d/(?!(project)).*\.yaml
@@ -1385,6 +1452,9 @@
- ^plugin.spec$
- ^rally-jobs/.*$
- ^roles/.*functional.*$
+ - ^playbooks/.*dvr-multinode.*$
+ - ^playbooks/.*dynamic-routing.*$
- ^playbooks/.*functional.*$
+ - ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- ^zuul.d/(?!(project)).*\.yaml