Skip to content

Commit 049bf27

Browse files
brianphaleykarelyatin
authored andcommitted
Fix regex lines in zuul.d/* files
Commit 260c968 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), so it's impossible to replace the previous pcre filter with a similar RE2 filter. Instead of reverting to the original filter, which is considered obsolete by zuul, this patch fixes the issue by explicitly listing all files under zuul.d/ except the one that we actually want to trigger the jobs: zuul.d/project.yaml. Listing all the files in the directory for every job is not ideal, and we may revisit it later, or perhaps even reconsider the extensive use of irrelevant-files in the neutron tree. This will have to wait for when the gate is in better shape though. [0] google/re2#156 Conflicts: zuul.d/job-templates.yaml zuul.d/project.yaml Related-bug: #2065821 Change-Id: I3bba89ac14414c6b7d375072ae92d2e0b5497736 (cherry picked from commit 11027e3) (cherry picked from commit 0afdfb0) (cherry picked from commit af8d615) (cherry picked from commit 0b7af2b)
1 parent 2fdb302 commit 049bf27

File tree

6 files changed

+105
-15
lines changed

6 files changed

+105
-15
lines changed

zuul.d/base.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,13 @@
3232
- ^roles/add_mariadb_repo/.*$
3333
- ^roles/nftables/.*$
3434
- ^rally-jobs/.*$
35-
- ^zuul.d/(?!(project)).*\.yaml
35+
# Ignore everything except for zuul.d/project.yaml
36+
- ^zuul.d/base.yaml
37+
- ^zuul.d/grenade.yaml
38+
- ^zuul.d/job-templates.yaml
39+
- ^zuul.d/rally.yaml
40+
- ^zuul.d/tempest-multinode.yaml
41+
- ^zuul.d/tempest-singlenode.yaml
3642
vars:
3743
configure_swap_size: 8192
3844
Q_BUILD_OVS_FROM_GIT: True
@@ -96,7 +102,13 @@
96102
- ^roles/add_mariadb_repo/.*$
97103
- ^roles/nftables/.*$
98104
- ^rally-jobs/.*$
99-
- ^zuul.d/(?!(project)).*\.yaml
105+
# Ignore everything except for zuul.d/project.yaml
106+
- ^zuul.d/base.yaml
107+
- ^zuul.d/grenade.yaml
108+
- ^zuul.d/job-templates.yaml
109+
- ^zuul.d/rally.yaml
110+
- ^zuul.d/tempest-multinode.yaml
111+
- ^zuul.d/tempest-singlenode.yaml
100112

101113
- job:
102114
name: neutron-fullstack-with-uwsgi

zuul.d/grenade.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,13 @@
3333
- ^roles/.*functional.*$
3434
- ^playbooks/.*functional.*$
3535
- ^vagrant/.*$
36-
- ^zuul.d/(?!(project)).*\.yaml
36+
# Ignore everything except for zuul.d/project.yaml
37+
- ^zuul.d/base.yaml
38+
- ^zuul.d/grenade.yaml
39+
- ^zuul.d/job-templates.yaml
40+
- ^zuul.d/rally.yaml
41+
- ^zuul.d/tempest-multinode.yaml
42+
- ^zuul.d/tempest-singlenode.yaml
3743
vars:
3844
devstack_services:
3945
etcd: false
@@ -200,7 +206,13 @@
200206
- ^roles/.*functional.*$
201207
- ^playbooks/.*functional.*$
202208
- ^vagrant/.*$
203-
- ^zuul.d/(?!(project)).*\.yaml
209+
# Ignore everything except for zuul.d/project.yaml
210+
- ^zuul.d/base.yaml
211+
- ^zuul.d/grenade.yaml
212+
- ^zuul.d/job-templates.yaml
213+
- ^zuul.d/rally.yaml
214+
- ^zuul.d/tempest-multinode.yaml
215+
- ^zuul.d/tempest-singlenode.yaml
204216
roles:
205217
- zuul: openstack/neutron-tempest-plugin
206218
required-projects:

zuul.d/job-templates.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,13 @@
1919
- ^playbooks/.*$
2020
- ^roles/.*$
2121
- ^rally-jobs/.*$
22-
- ^zuul.d/(?!(job-templates)).*\.yaml
22+
# Ignore everything except for zuul.d/job-templates.yaml
23+
- ^zuul.d/base.yaml
24+
- ^zuul.d/grenade.yaml
25+
- ^zuul.d/project.yaml
26+
- ^zuul.d/rally.yaml
27+
- ^zuul.d/tempest-multinode.yaml
28+
- ^zuul.d/tempest-singlenode.yaml
2329
- openstack-tox-py39: # from openstack-python3-zed-jobs template
2430
timeout: 3600
2531
irrelevant-files: *irrelevant-files
@@ -108,7 +114,13 @@
108114
- ^neutron/scheduler/.*$
109115
- ^roles/.*functional.*$
110116
- ^playbooks/.*functional.*$
111-
- ^zuul.d/(?!(project)).*\.yaml
117+
# Ignore everything except for zuul.d/project.yaml
118+
- ^zuul.d/base.yaml
119+
- ^zuul.d/grenade.yaml
120+
- ^zuul.d/job-templates.yaml
121+
- ^zuul.d/rally.yaml
122+
- ^zuul.d/tempest-multinode.yaml
123+
- ^zuul.d/tempest-singlenode.yaml
112124

113125
- project-template:
114126
name: neutron-periodic-jobs

zuul.d/rally.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,13 @@
8181
- ^neutron/common/ovn/.*$
8282
- ^roles/.*functional.*$
8383
- ^playbooks/.*functional.*$
84-
- ^zuul.d/(?!(project)).*\.yaml
84+
# Ignore everything except for zuul.d/project.yaml
85+
- ^zuul.d/base.yaml
86+
- ^zuul.d/grenade.yaml
87+
- ^zuul.d/job-templates.yaml
88+
- ^zuul.d/rally.yaml
89+
- ^zuul.d/tempest-multinode.yaml
90+
- ^zuul.d/tempest-singlenode.yaml
8591

8692
- job:
8793
name: neutron-ovn-rally-task
@@ -123,7 +129,13 @@
123129
- ^neutron/scheduler/.*$
124130
- ^roles/.*functional.*$
125131
- ^playbooks/.*functional.*$
126-
- ^zuul.d/(?!(project)).*\.yaml
132+
# Ignore everything except for zuul.d/project.yaml
133+
- ^zuul.d/base.yaml
134+
- ^zuul.d/grenade.yaml
135+
- ^zuul.d/job-templates.yaml
136+
- ^zuul.d/rally.yaml
137+
- ^zuul.d/tempest-multinode.yaml
138+
- ^zuul.d/tempest-singlenode.yaml
127139
vars:
128140
devstack_plugins:
129141
neutron: https://opendev.org/openstack/neutron

zuul.d/tempest-multinode.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,13 @@
3737
- ^roles/.*functional.*$
3838
- ^playbooks/.*functional.*$
3939
- ^vagrant/.*$
40-
- ^zuul.d/(?!(project)).*\.yaml
40+
# Ignore everything except for zuul.d/project.yaml
41+
- ^zuul.d/base.yaml
42+
- ^zuul.d/grenade.yaml
43+
- ^zuul.d/job-templates.yaml
44+
- ^zuul.d/rally.yaml
45+
- ^zuul.d/tempest-multinode.yaml
46+
- ^zuul.d/tempest-singlenode.yaml
4147
vars:
4248
tox_envlist: integrated-network
4349
devstack_localrc:
@@ -359,7 +365,13 @@
359365
- ^neutron/scheduler/.*$
360366
- ^roles/.*functional.*$
361367
- ^playbooks/.*functional.*$
362-
- ^zuul.d/(?!(project)).*\.yaml
368+
# Ignore everything except for zuul.d/project.yaml
369+
- ^zuul.d/base.yaml
370+
- ^zuul.d/grenade.yaml
371+
- ^zuul.d/job-templates.yaml
372+
- ^zuul.d/rally.yaml
373+
- ^zuul.d/tempest-multinode.yaml
374+
- ^zuul.d/tempest-singlenode.yaml
363375
roles:
364376
- zuul: zuul/zuul-jobs
365377
- zuul: openstack/neutron-tempest-plugin

zuul.d/tempest-singlenode.yaml

Lines changed: 35 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,13 @@
8282
- ^neutron/common/ovn/.*$
8383
- ^roles/.*functional.*$
8484
- ^playbooks/.*functional.*$
85-
- ^zuul.d/(?!(project)).*\.yaml
85+
# Ignore everything except for zuul.d/project.yaml
86+
- ^zuul.d/base.yaml
87+
- ^zuul.d/grenade.yaml
88+
- ^zuul.d/job-templates.yaml
89+
- ^zuul.d/rally.yaml
90+
- ^zuul.d/tempest-multinode.yaml
91+
- ^zuul.d/tempest-singlenode.yaml
8692

8793
- job:
8894
name: neutron-ovs-tempest-dvr
@@ -143,7 +149,13 @@
143149
- ^neutron/common/ovn/.*$
144150
- ^roles/.*functional.*$
145151
- ^playbooks/.*functional.*$
146-
- ^zuul.d/(?!(project)).*\.yaml
152+
# Ignore everything except for zuul.d/project.yaml
153+
- ^zuul.d/base.yaml
154+
- ^zuul.d/grenade.yaml
155+
- ^zuul.d/job-templates.yaml
156+
- ^zuul.d/rally.yaml
157+
- ^zuul.d/tempest-multinode.yaml
158+
- ^zuul.d/tempest-singlenode.yaml
147159

148160
- job:
149161
name: neutron-ovs-tempest-iptables_hybrid
@@ -244,7 +256,13 @@
244256
- ^neutron/plugins/ml2/drivers/.*$
245257
- ^roles/.*functional.*$
246258
- ^playbooks/.*functional.*$
247-
- ^zuul.d/(?!(project)).*\.yaml
259+
# Ignore everything except for zuul.d/project.yaml
260+
- ^zuul.d/base.yaml
261+
- ^zuul.d/grenade.yaml
262+
- ^zuul.d/job-templates.yaml
263+
- ^zuul.d/rally.yaml
264+
- ^zuul.d/tempest-multinode.yaml
265+
- ^zuul.d/tempest-singlenode.yaml
248266

249267
- job:
250268
name: neutron-ovn-tempest-mariadb-full
@@ -320,7 +338,13 @@
320338
- ^vagrant/.*$
321339
- ^roles/.*functional.*$
322340
- ^playbooks/.*functional.*$
323-
- ^zuul.d/(?!(project)).*\.yaml
341+
# Ignore everything except for zuul.d/project.yaml
342+
- ^zuul.d/base.yaml
343+
- ^zuul.d/grenade.yaml
344+
- ^zuul.d/job-templates.yaml
345+
- ^zuul.d/rally.yaml
346+
- ^zuul.d/tempest-multinode.yaml
347+
- ^zuul.d/tempest-singlenode.yaml
324348

325349
- job:
326350
name: neutron-ovn-tempest-with-uwsgi-loki
@@ -448,7 +472,13 @@
448472
- ^neutron/scheduler/.*$
449473
- ^roles/.*functional.*$
450474
- ^playbooks/.*functional.*$
451-
- ^zuul.d/(?!(project)).*\.yaml
475+
# Ignore everything except for zuul.d/project.yaml
476+
- ^zuul.d/base.yaml
477+
- ^zuul.d/grenade.yaml
478+
- ^zuul.d/job-templates.yaml
479+
- ^zuul.d/rally.yaml
480+
- ^zuul.d/tempest-multinode.yaml
481+
- ^zuul.d/tempest-singlenode.yaml
452482

453483
# TODO(slaweq): move this to be multinode job when it will be possible in Zuul
454484
- job:

0 commit comments

Comments
 (0)