Fix regex lines in zuul.d/* files
Commit c76727b97c040 broke the gate by causing jobs
to not get run when it added RE2 compatibility for
irrelevant files. Digging found that RE2 doesn't
support negative lookahead (and won't ever). This
fixes the issue by just not including the single
file we care about in each section.
[0] https://github.com/google/re2/issues/156
Change-Id: I6f8445bcd2a409cc0e85943b7d20ce578e37dd55
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 8389c18..8fc094f 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -218,8 +218,17 @@
- ^roles/.*functional.*$
- ^playbooks/.*functional.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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
@@ -315,8 +324,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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
@@ -421,8 +439,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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
@@ -587,8 +614,17 @@
- ^playbooks/.*dynamic-routing.*$
- ^playbooks/.*functional.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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,8 +762,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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
@@ -957,8 +1002,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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
@@ -986,6 +1040,9 @@
- designate-tempest-plugin
- neutron-tempest-plugin
tempest_test_regex: ^neutron_tempest_plugin\.scenario\.test_dns_integration
+ files:
+ # This should override the ignore below for all of neutron/services
+ - neutron/services/externaldns/.*
irrelevant-files:
- ^\.pylintrc$
- ^(test-|)requirements.txt$
@@ -1007,8 +1064,7 @@
- ^neutron/privileged/.*$
- ^neutron/plugins/ml2/drivers/.*$
- ^neutron/scheduler/.*$
- - regex: ^neutron/services/externaldns.*$
- negate: true
+ - ^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/.*$
@@ -1019,8 +1075,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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
@@ -1096,8 +1161,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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
@@ -1165,8 +1239,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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
@@ -1220,8 +1303,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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
@@ -1286,8 +1378,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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
@@ -1356,8 +1457,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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
@@ -1417,8 +1527,17 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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
@@ -1527,5 +1646,14 @@
- ^playbooks/.*functional.*$
- ^playbooks/.*linuxbridge.*$
- ^vagrant/.*$
- - regex: ^zuul.d/project.*\.yaml
- negate: true
+ # 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