commit 77052674d937cebccf6eded30aefa9d56b0d1467
author Zuul <zuul@review.opendev.org> Thu Feb 03 18:27:58 2022 +0000
committer Gerrit Code Review <review@openstack.org> Thu Feb 03 18:27:58 2022 +0000
tree 8816a837d40c1565c130556f86fdc13a3ead66a7
parent 77bfe311d25417a90d9b7761e789d6a08c3f50c4
parent 88fc3fb64e9901ec64b141cbcad1e0fc5325fedf

Merge "Re-enable IPv6Test in OVN scenario job"

zuul.d/base.yaml

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index bd2ae09..e524c0b 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -99,8 +99,7 @@
       - ^tox.ini$
       - ^rally-jobs/.*$
       - ^vagrant/.*$
-      - ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
-      - ^zuul.d/base-nested-switch.yaml$
+      - ^zuul.d/(?!(project)).*\.yaml
 
 - job:
     name: neutron-tempest-plugin-scenario

zuul.d/master_jobs.yaml

diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 6f62748..e27b01d 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -132,8 +132,7 @@
       - ^neutron_tempest_plugin/scenario/.*$
       - ^rally-jobs/.*$
       - ^vagrant/.*$
-      - ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
-      - ^zuul.d/base-nested-switch.yaml$
+      - ^zuul.d/(?!(project)).*\.yaml
 
 - job:
     name: neutron-tempest-plugin-scenario-openvswitch
@@ -221,8 +220,7 @@
       - ^neutron_tempest_plugin/services/bgp/.*$
       - ^rally-jobs/.*$
       - ^vagrant/.*$
-      - ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
-      - ^zuul.d/base-nested-switch.yaml$
+      - ^zuul.d/(?!(project)).*\.yaml
 
 - job:
     name: neutron-tempest-plugin-scenario-openvswitch-iptables_hybrid
@@ -320,8 +318,7 @@
       - ^neutron_tempest_plugin/services/bgp/.*$
       - ^rally-jobs/.*$
       - ^vagrant/.*$
-      - ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
-      - ^zuul.d/base-nested-switch.yaml$
+      - ^zuul.d/(?!(project)).*\.yaml
 
 - job:
     name: neutron-tempest-plugin-scenario-openvswitch-distributed-dhcp
@@ -452,8 +449,7 @@
       - ^neutron_tempest_plugin/services/bgp/.*$
       - ^rally-jobs/.*$
       - ^vagrant/.*$
-      - ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
-      - ^zuul.d/base-nested-switch.yaml$
+      - ^zuul.d/(?!(project)).*\.yaml
 
 - job:
     name: neutron-tempest-plugin-scenario-ovn
@@ -584,8 +580,7 @@
       - ^neutron_tempest_plugin/services/bgp/.*$
       - ^rally-jobs/.*$
       - ^vagrant/.*$
-      - ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
-      - ^zuul.d/base-nested-switch.yaml$
+      - ^zuul.d/(?!(project)).*\.yaml
 
 - job:
     name: neutron-tempest-plugin-dvr-multinode-scenario
@@ -827,8 +822,7 @@
       - ^neutron_tempest_plugin/services/bgp/.*$
       - ^rally-jobs/.*$
       - ^vagrant/.*$
-      - ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
-      - ^zuul.d/base-nested-switch.yaml$
+      - ^zuul.d/(?!(project)).*\.yaml
 
 - job:
     name: neutron-tempest-plugin-sfc
@@ -891,8 +885,7 @@
       - ^tox.ini$
       - ^rally-jobs/.*$
       - ^vagrant/.*$
-      - ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
-      - ^zuul.d/base-nested-switch.yaml$
+      - ^zuul.d/(?!(project)).*\.yaml
 
 - job:
     name: neutron-tempest-plugin-bgpvpn-bagpipe
@@ -951,8 +944,7 @@
       - ^tox.ini$
       - ^rally-jobs/.*$
       - ^vagrant/.*$
-      - ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
-      - ^zuul.d/base-nested-switch.yaml$
+      - ^zuul.d/(?!(project)).*\.yaml
 
 - job:
     name: neutron-tempest-plugin-dynamic-routing
@@ -1016,8 +1008,7 @@
       - ^tox.ini$
       - ^rally-jobs/.*$
       - ^vagrant/.*$
-      - ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
-      - ^zuul.d/base-nested-switch.yaml$
+      - ^zuul.d/(?!(project)).*\.yaml
 
 - job:
     name: neutron-tempest-plugin-vpnaas
@@ -1076,8 +1067,7 @@
       - ^tox.ini$
       - ^rally-jobs/.*$
       - ^vagrant/.*$
-      - ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
-      - ^zuul.d/base-nested-switch.yaml$
+      - ^zuul.d/(?!(project)).*\.yaml
 
 - job:
     name: neutron-tempest-plugin-tap-as-a-service
@@ -1180,5 +1170,4 @@
       - ^tox.ini$
       - ^rally-jobs/.*$
       - ^vagrant/.*$
-      - ^zuul.d/(queens|rocky|stein|train|ussuri)_jobs.yaml$
-      - ^zuul.d/base-nested-switch.yaml$
+      - ^zuul.d/(?!(project)).*\.yaml