Skip to content

Commit e1cb5fa

Browse files
Zuulopenstack-gerrit
authored andcommitted
Merge "Fix regex lines in zuul.d/* files" into stable/2023.1
2 parents 5072af6 + 0b7af2b commit e1cb5fa

File tree

7 files changed

+105
-15
lines changed

7 files changed

+105
-15
lines changed

zuul.d/base.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,13 @@
3333
- ^roles/add_mariadb_repo/.*$
3434
- ^roles/nftables/.*$
3535
- ^rally-jobs/.*$
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
configure_swap_size: 8192
3945
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
@@ -34,7 +34,13 @@
3434
- ^roles/.*functional.*$
3535
- ^playbooks/.*functional.*$
3636
- ^vagrant/.*$
37-
- ^zuul.d/(?!(project)).*\.yaml
37+
# Ignore everything except for zuul.d/project.yaml
38+
- ^zuul.d/base.yaml
39+
- ^zuul.d/grenade.yaml
40+
- ^zuul.d/job-templates.yaml
41+
- ^zuul.d/rally.yaml
42+
- ^zuul.d/tempest-multinode.yaml
43+
- ^zuul.d/tempest-singlenode.yaml
3844
vars:
3945
grenade_devstack_localrc:
4046
shared:
@@ -249,7 +255,13 @@
249255
- ^roles/.*functional.*$
250256
- ^playbooks/.*functional.*$
251257
- ^vagrant/.*$
252-
- ^zuul.d/(?!(project)).*\.yaml
258+
# Ignore everything except for zuul.d/project.yaml
259+
- ^zuul.d/base.yaml
260+
- ^zuul.d/grenade.yaml
261+
- ^zuul.d/job-templates.yaml
262+
- ^zuul.d/rally.yaml
263+
- ^zuul.d/tempest-multinode.yaml
264+
- ^zuul.d/tempest-singlenode.yaml
253265
roles:
254266
- zuul: openstack/neutron-tempest-plugin
255267
required-projects:

zuul.d/job-templates.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,13 @@
2020
- ^playbooks/.*$
2121
- ^roles/.*$
2222
- ^rally-jobs/.*$
23-
- ^zuul.d/(?!(job-templates)).*\.yaml
23+
# Ignore everything except for zuul.d/job-templates.yaml
24+
- ^zuul.d/base.yaml
25+
- ^zuul.d/grenade.yaml
26+
- ^zuul.d/project.yaml
27+
- ^zuul.d/rally.yaml
28+
- ^zuul.d/tempest-multinode.yaml
29+
- ^zuul.d/tempest-singlenode.yaml
2430
- openstack-tox-py310: # from openstack-python3-jobs template
2531
timeout: 3600
2632
irrelevant-files: *irrelevant-files

zuul.d/project.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,13 @@
6565
- ^neutron/scheduler/.*$
6666
- ^roles/.*functional.*$
6767
- ^playbooks/.*functional.*$
68-
- ^zuul.d/(?!(project)).*\.yaml
68+
# Ignore everything except for zuul.d/project.yaml
69+
- ^zuul.d/base.yaml
70+
- ^zuul.d/grenade.yaml
71+
- ^zuul.d/job-templates.yaml
72+
- ^zuul.d/rally.yaml
73+
- ^zuul.d/tempest-multinode.yaml
74+
- ^zuul.d/tempest-singlenode.yaml
6975
- neutron-ovn-tempest-ovs-release-ubuntu-old:
7076
irrelevant-files: *ovn-irrelevant-files
7177

zuul.d/rally.yaml

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

8591
- job:
8692
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
@@ -73,7 +73,13 @@
7373
- ^roles/.*functional.*$
7474
- ^playbooks/.*functional.*$
7575
- ^vagrant/.*$
76-
- ^zuul.d/(?!(project)).*\.yaml
76+
# Ignore everything except for zuul.d/project.yaml
77+
- ^zuul.d/base.yaml
78+
- ^zuul.d/grenade.yaml
79+
- ^zuul.d/job-templates.yaml
80+
- ^zuul.d/rally.yaml
81+
- ^zuul.d/tempest-multinode.yaml
82+
- ^zuul.d/tempest-singlenode.yaml
7783
vars:
7884
tox_envlist: integrated-network
7985
devstack_localrc:
@@ -399,7 +405,13 @@
399405
- ^neutron/scheduler/.*$
400406
- ^roles/.*functional.*$
401407
- ^playbooks/.*functional.*$
402-
- ^zuul.d/(?!(project)).*\.yaml
408+
# Ignore everything except for zuul.d/project.yaml
409+
- ^zuul.d/base.yaml
410+
- ^zuul.d/grenade.yaml
411+
- ^zuul.d/job-templates.yaml
412+
- ^zuul.d/rally.yaml
413+
- ^zuul.d/tempest-multinode.yaml
414+
- ^zuul.d/tempest-singlenode.yaml
403415
roles:
404416
- zuul: zuul/zuul-jobs
405417
- zuul: openstack/neutron-tempest-plugin

zuul.d/tempest-singlenode.yaml

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

8894
- job:
8995
name: neutron-ovs-tempest-dvr
@@ -145,7 +151,13 @@
145151
- ^neutron/common/ovn/.*$
146152
- ^roles/.*functional.*$
147153
- ^playbooks/.*functional.*$
148-
- ^zuul.d/(?!(project)).*\.yaml
154+
# Ignore everything except for zuul.d/project.yaml
155+
- ^zuul.d/base.yaml
156+
- ^zuul.d/grenade.yaml
157+
- ^zuul.d/job-templates.yaml
158+
- ^zuul.d/rally.yaml
159+
- ^zuul.d/tempest-multinode.yaml
160+
- ^zuul.d/tempest-singlenode.yaml
149161

150162
- job:
151163
name: neutron-ovs-tempest-iptables_hybrid
@@ -248,7 +260,13 @@
248260
- ^neutron/plugins/ml2/drivers/.*$
249261
- ^roles/.*functional.*$
250262
- ^playbooks/.*functional.*$
251-
- ^zuul.d/(?!(project)).*\.yaml
263+
# Ignore everything except for zuul.d/project.yaml
264+
- ^zuul.d/base.yaml
265+
- ^zuul.d/grenade.yaml
266+
- ^zuul.d/job-templates.yaml
267+
- ^zuul.d/rally.yaml
268+
- ^zuul.d/tempest-multinode.yaml
269+
- ^zuul.d/tempest-singlenode.yaml
252270

253271
- job:
254272
name: neutron-ovn-tempest-mariadb-full
@@ -333,7 +351,13 @@
333351
- ^vagrant/.*$
334352
- ^roles/.*functional.*$
335353
- ^playbooks/.*functional.*$
336-
- ^zuul.d/(?!(project)).*\.yaml
354+
# Ignore everything except for zuul.d/project.yaml
355+
- ^zuul.d/base.yaml
356+
- ^zuul.d/grenade.yaml
357+
- ^zuul.d/job-templates.yaml
358+
- ^zuul.d/rally.yaml
359+
- ^zuul.d/tempest-multinode.yaml
360+
- ^zuul.d/tempest-singlenode.yaml
337361

338362
- job:
339363
name: neutron-ovn-tempest-with-uwsgi-loki
@@ -473,7 +497,13 @@
473497
- ^neutron/scheduler/.*$
474498
- ^roles/.*functional.*$
475499
- ^playbooks/.*functional.*$
476-
- ^zuul.d/(?!(project)).*\.yaml
500+
# Ignore everything except for zuul.d/project.yaml
501+
- ^zuul.d/base.yaml
502+
- ^zuul.d/grenade.yaml
503+
- ^zuul.d/job-templates.yaml
504+
- ^zuul.d/rally.yaml
505+
- ^zuul.d/tempest-multinode.yaml
506+
- ^zuul.d/tempest-singlenode.yaml
477507

478508
- job:
479509
name: neutron-ovn-tempest-ovs-release

0 commit comments

Comments
 (0)