Skip to content

Commit 5213ea7

Browse files
John L. VillalovosRuby Loo
John L. Villalovos
authored and
Ruby Loo
committed
Clean-up zuul.d/ files
Create a new base job: legacy-ipa-dsvm-base Define 'irrelevant-files' in legacy-ipa-dsvm-base and remove them from project.yaml. This means we only define 'irrelevant-files' once. Also makes project.yaml much easier to read. Fix the 'irrelevant-files' section to make sure we do test when changes to 'requirements.txt'. Remove the 'branches:' section from the experimental job 'ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3' Sort the jobs lists in project.yaml. Change-Id: Idbace38e0558e8a80e2d405ea0f6a0698989e140 (cherry picked from commit 8ba851b)
1 parent c6b579d commit 5213ea7

File tree

2 files changed

+57
-212
lines changed

2 files changed

+57
-212
lines changed

‎zuul.d/legacy-ironic-jobs.yaml‎

Lines changed: 36 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,27 @@
1+
- job:
2+
name: legacy-ipa-dsvm-base
3+
# NOTE: We do not use 'legacy-ironic-dsvm-base' as simpler and less
4+
# confusing to define it all here and then use 'legacy-dsvm-base'
5+
parent: legacy-dsvm-base
6+
irrelevant-files:
7+
- ^test-requirements.txt$
8+
- ^.*\.rst$
9+
- ^doc/.*$
10+
- ^ironic_python_agent/tests/.*$
11+
- ^releasenotes/.*$
12+
- ^setup.cfg$
13+
- ^tools/.*$
14+
- ^tox.ini$
15+
required-projects:
16+
- openstack-infra/devstack-gate
17+
- openstack/ironic
18+
- openstack/ironic-lib
19+
- openstack/ironic-python-agent
20+
- openstack/pyghmi
21+
- openstack/python-ironicclient
22+
- openstack/tempest
23+
- openstack/virtualbmc
24+
125
- job:
226
name: ironic-python-agent-tox-func
327
parent: legacy-base
@@ -9,77 +33,70 @@
933

1034
- job:
1135
name: ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src
12-
parent: legacy-ironic-dsvm-base
36+
parent: legacy-ipa-dsvm-base
1337
run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src/run.yaml
1438
post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src/post.yaml
1539
timeout: 5400
1640

1741
- job:
1842
name: ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src
19-
parent: legacy-ironic-dsvm-base
43+
parent: legacy-ipa-dsvm-base
2044
run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src/run.yaml
2145
post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src/post.yaml
2246
timeout: 5400
2347

2448
- job:
2549
name: ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src
26-
parent: legacy-ironic-dsvm-base
50+
parent: legacy-ipa-dsvm-base
2751
run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src/run.yaml
2852
post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src/post.yaml
2953
timeout: 5400
3054

3155
- job:
3256
name: ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src
33-
parent: legacy-ironic-dsvm-base
57+
parent: legacy-ipa-dsvm-base
3458
run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src/run.yaml
3559
post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src/post.yaml
3660
timeout: 5400
3761

3862
- job:
3963
name: ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src
40-
parent: legacy-ironic-dsvm-base
64+
parent: legacy-ipa-dsvm-base
4165
run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src/run.yaml
4266
post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src/post.yaml
4367
timeout: 5400
4468

4569
- job:
4670
name: ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src
47-
parent: legacy-ironic-dsvm-base
71+
parent: legacy-ipa-dsvm-base
4872
run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src/run.yaml
4973
post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src/post.yaml
5074
timeout: 5400
5175

5276
- job:
5377
name: ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src
54-
parent: legacy-ironic-dsvm-base
78+
parent: legacy-ipa-dsvm-base
5579
run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src/run.yaml
5680
post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src/post.yaml
5781
timeout: 5400
5882

5983
- job:
6084
name: ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src
61-
parent: legacy-ironic-dsvm-base
85+
parent: legacy-ipa-dsvm-base
6286
run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src/run.yaml
6387
post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src/post.yaml
6488
timeout: 5400
6589

6690
- job:
6791
name: ipa-tempest-dsvm-ironic-inspector-src
68-
parent: legacy-ironic-dsvm-base
92+
parent: legacy-ipa-dsvm-base
6993
run: playbooks/legacy/tempest-dsvm-ironic-inspector-src/run.yaml
7094
post-run: playbooks/legacy/tempest-dsvm-ironic-inspector-src/post.yaml
7195
timeout: 10800
7296
required-projects:
73-
- openstack-infra/devstack-gate
74-
- openstack/ironic
97+
# These are in addition to what is in legacy-ipa-dsvm-base
7598
- openstack/ironic-inspector
76-
- openstack/ironic-lib
77-
- openstack/ironic-python-agent
78-
- openstack/pyghmi
7999
- openstack/python-ironic-inspector-client
80-
- openstack/python-ironicclient
81-
- openstack/tempest
82-
- openstack/virtualbmc
83100

84101
- job:
85102
name: ironic-python-agent-buildimage-coreos
@@ -97,14 +114,14 @@
97114

98115
- job:
99116
name: ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src
100-
parent: legacy-ironic-dsvm-base
117+
parent: legacy-ipa-dsvm-base
101118
run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src/run.yaml
102119
post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src/post.yaml
103120
timeout: 5400
104121

105122
- job:
106123
name: ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3
107-
parent: legacy-ironic-dsvm-base
124+
parent: legacy-ipa-dsvm-base
108125
run: playbooks/legacy/ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3/run.yaml
109126
post-run: playbooks/legacy/ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3/post.yaml
110127
timeout: 5400

‎zuul.d/project.yaml‎

Lines changed: 21 additions & 193 deletions
Original file line numberDiff line numberDiff line change
@@ -2,205 +2,33 @@
22
name: openstack/ironic-python-agent
33
check:
44
jobs:
5-
- ironic-python-agent-tox-func:
6-
voting: false
7-
- ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src:
8-
irrelevant-files:
9-
- ^(test-|)requirements.txt$
10-
- ^.*\.rst$
11-
- ^doc/.*$
12-
- ^ironic_python_agent/tests/.*$
13-
- ^releasenotes/.*$
14-
- ^setup.cfg$
15-
- ^tools/.*$
16-
- ^tox.ini$
17-
- ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src:
18-
irrelevant-files:
19-
- ^(test-|)requirements.txt$
20-
- ^.*\.rst$
21-
- ^doc/.*$
22-
- ^ironic_python_agent/tests/.*$
23-
- ^releasenotes/.*$
24-
- ^setup.cfg$
25-
- ^tools/.*$
26-
- ^tox.ini$
27-
- ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src:
28-
irrelevant-files:
29-
- ^(test-|)requirements.txt$
30-
- ^.*\.rst$
31-
- ^doc/.*$
32-
- ^ironic_python_agent/tests/.*$
33-
- ^releasenotes/.*$
34-
- ^setup.cfg$
35-
- ^tools/.*$
36-
- ^tox.ini$
37-
- ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src:
38-
irrelevant-files:
39-
- ^(test-|)requirements.txt$
40-
- ^.*\.rst$
41-
- ^doc/.*$
42-
- ^ironic_python_agent/tests/.*$
43-
- ^releasenotes/.*$
44-
- ^setup.cfg$
45-
- ^tools/.*$
46-
- ^tox.ini$
47-
- ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src:
48-
irrelevant-files:
49-
- ^(test-|)requirements.txt$
50-
- ^.*\.rst$
51-
- ^doc/.*$
52-
- ^ironic_python_agent/tests/.*$
53-
- ^releasenotes/.*$
54-
- ^setup.cfg$
55-
- ^tools/.*$
56-
- ^tox.ini$
57-
- ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src:
58-
irrelevant-files:
59-
- ^(test-|)requirements.txt$
60-
- ^.*\.rst$
61-
- ^doc/.*$
62-
- ^ironic_python_agent/tests/.*$
63-
- ^releasenotes/.*$
64-
- ^setup.cfg$
65-
- ^tools/.*$
66-
- ^tox.ini$
67-
- ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src:
68-
irrelevant-files:
69-
- ^(test-|)requirements.txt$
70-
- ^.*\.rst$
71-
- ^doc/.*$
72-
- ^ironic_python_agent/tests/.*$
73-
- ^releasenotes/.*$
74-
- ^setup.cfg$
75-
- ^tools/.*$
76-
- ^tox.ini$
77-
- ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src:
78-
irrelevant-files:
79-
- ^(test-|)requirements.txt$
80-
- ^.*\.rst$
81-
- ^doc/.*$
82-
- ^ironic_python_agent/tests/.*$
83-
- ^releasenotes/.*$
84-
- ^setup.cfg$
85-
- ^tools/.*$
86-
- ^tox.ini$
5+
- ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src
6+
- ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src
7+
- ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src
8+
- ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src
9+
- ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src
10+
- ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src
11+
- ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src
12+
- ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src
13+
# Non-voting jobs
8714
- ipa-tempest-dsvm-ironic-inspector-src:
8815
voting: false
89-
irrelevant-files:
90-
- ^(test-|)requirements.txt$
91-
- ^.*\.rst$
92-
- ^doc/.*$
93-
- ^ironic_python_agent/tests/.*$
94-
- ^releasenotes/.*$
95-
- ^setup.cfg$
96-
- ^tools/.*$
97-
- ^tox.ini$
16+
- ironic-python-agent-tox-func:
17+
voting: false
9818
gate:
9919
jobs:
100-
- ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src:
101-
irrelevant-files:
102-
- ^(test-|)requirements.txt$
103-
- ^.*\.rst$
104-
- ^doc/.*$
105-
- ^ironic_python_agent/tests/.*$
106-
- ^releasenotes/.*$
107-
- ^setup.cfg$
108-
- ^tools/.*$
109-
- ^tox.ini$
110-
- ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src:
111-
irrelevant-files:
112-
- ^(test-|)requirements.txt$
113-
- ^.*\.rst$
114-
- ^doc/.*$
115-
- ^ironic_python_agent/tests/.*$
116-
- ^releasenotes/.*$
117-
- ^setup.cfg$
118-
- ^tools/.*$
119-
- ^tox.ini$
120-
- ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src:
121-
irrelevant-files:
122-
- ^(test-|)requirements.txt$
123-
- ^.*\.rst$
124-
- ^doc/.*$
125-
- ^ironic_python_agent/tests/.*$
126-
- ^releasenotes/.*$
127-
- ^setup.cfg$
128-
- ^tools/.*$
129-
- ^tox.ini$
130-
- ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src:
131-
irrelevant-files:
132-
- ^(test-|)requirements.txt$
133-
- ^.*\.rst$
134-
- ^doc/.*$
135-
- ^ironic_python_agent/tests/.*$
136-
- ^releasenotes/.*$
137-
- ^setup.cfg$
138-
- ^tools/.*$
139-
- ^tox.ini$
140-
- ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src:
141-
irrelevant-files:
142-
- ^(test-|)requirements.txt$
143-
- ^.*\.rst$
144-
- ^doc/.*$
145-
- ^ironic_python_agent/tests/.*$
146-
- ^releasenotes/.*$
147-
- ^setup.cfg$
148-
- ^tools/.*$
149-
- ^tox.ini$
150-
- ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src:
151-
irrelevant-files:
152-
- ^(test-|)requirements.txt$
153-
- ^.*\.rst$
154-
- ^doc/.*$
155-
- ^ironic_python_agent/tests/.*$
156-
- ^releasenotes/.*$
157-
- ^setup.cfg$
158-
- ^tools/.*$
159-
- ^tox.ini$
160-
- ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src:
161-
irrelevant-files:
162-
- ^(test-|)requirements.txt$
163-
- ^.*\.rst$
164-
- ^doc/.*$
165-
- ^ironic_python_agent/tests/.*$
166-
- ^releasenotes/.*$
167-
- ^setup.cfg$
168-
- ^tools/.*$
169-
- ^tox.ini$
170-
- ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src:
171-
irrelevant-files:
172-
- ^(test-|)requirements.txt$
173-
- ^.*\.rst$
174-
- ^doc/.*$
175-
- ^ironic_python_agent/tests/.*$
176-
- ^releasenotes/.*$
177-
- ^setup.cfg$
178-
- ^tools/.*$
179-
- ^tox.ini$
20+
- ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src
21+
- ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src
22+
- ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src
23+
- ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src
24+
- ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src
25+
- ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src
26+
- ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src
27+
- ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src
18028
experimental:
18129
jobs:
182-
- ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src:
183-
irrelevant-files:
184-
- ^(test-|)requirements.txt$
185-
- ^.*\.rst$
186-
- ^doc/.*$
187-
- ^ironic_python_agent/tests/.*$
188-
- ^releasenotes/.*$
189-
- ^setup.cfg$
190-
- ^tools/.*$
191-
- ^tox.ini$
192-
- ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3:
193-
voting: false
194-
branches: ^(?!stable/(newton|ocata)).*$
195-
irrelevant-files:
196-
- ^(test-|)requirements.txt$
197-
- ^.*\.rst$
198-
- ^doc/.*$
199-
- ^ironic_python_agent/tests/.*$
200-
- ^releasenotes/.*$
201-
- ^setup.cfg$
202-
- ^tools/.*$
203-
- ^tox.ini$
30+
- ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src
31+
- ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3
20432
post:
20533
jobs:
20634
- ironic-python-agent-buildimage-coreos

0 commit comments

Comments
 (0)