summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Folco <rfolco@redhat.com>2018-11-21 14:25:06 -0200
committerRafael Folco <rfolco@redhat.com>2018-12-11 11:53:03 -0200
commit2af5efcbf71226571d7b4923210180fe35d79fd8 (patch)
tree836fe7bbe851ae9133fff9e166b7292954a4cee4
parent67ec71647fdadf86bb52002e2178e7c5ec54efaa (diff)
Deprecate tripleo stable/{newton,ocata} jobs
Non-containerized jobs were running for stable/newton and stable/ocata branches and are no longer supported. - Move deprecated jobs into a separate zuul config file - Reparent deprecated jobs to tripleo-ci-deprecated - Add a playbook with deprecated warning - Disable jobs with 'branches: none/deprecated' filter - Remove/disable non-containerized scenario jobs from layout - Add noop to templates with non-contrainerized jobs only * tripleo-multinode-baremetal-minimal template * tripleo-multinode-baremetal-full template - Rename (create a copy for) scen006 and scen009 with a '-container' suffix as these are containerized As tripleo-ci repo is not branched, all the projects that have these jobs in their zuul config (including all branches) will be affected. Therefore, a cleanup is required to deprecate jobs before removing them from zuul config. A follow-up change will *delete* the definition of deprecated jobs from zuul config, Story: https://tree.taiga.io/project/tripleo-ci-board/issue/372 Change-Id: I23df3518820d39f32d1daded33776d757c144217
Notes
Notes (review): Verified-1: RDO Third Party CI <dmsimard+rdothirdparty@redhat.com> Code-Review+1: Arx Cruz <arxcruz@redhat.com> Code-Review+2: Sagi Shnaidman <sshnaidm@redhat.com> Code-Review+2: Ronelle Landy <rlandy@redhat.com> Workflow+1: Alex Schultz <aschultz@redhat.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Thu, 13 Dec 2018 03:43:43 +0000 Reviewed-on: https://review.openstack.org/619337 Project: openstack-infra/tripleo-ci Branch: refs/heads/master
-rw-r--r--playbooks/deprecated/README.rst2
-rw-r--r--playbooks/deprecated/pre.yaml14
-rw-r--r--zuul.d/deprecated-jobs.yaml92
-rw-r--r--zuul.d/layout.yaml24
-rw-r--r--zuul.d/multinode-jobs.yaml99
5 files changed, 126 insertions, 105 deletions
diff --git a/playbooks/deprecated/README.rst b/playbooks/deprecated/README.rst
new file mode 100644
index 0000000..15865ee
--- /dev/null
+++ b/playbooks/deprecated/README.rst
@@ -0,0 +1,2 @@
1This playbook prints a deprecation warning message to inform
2that the job is no longer supported and should not be in use.
diff --git a/playbooks/deprecated/pre.yaml b/playbooks/deprecated/pre.yaml
new file mode 100644
index 0000000..ae2d587
--- /dev/null
+++ b/playbooks/deprecated/pre.yaml
@@ -0,0 +1,14 @@
1- name: Deprecation warning
2 hosts: all
3 gather_facts: no
4 tasks:
5 - name: Warn that the job is deprecated
6 debug:
7 msg: |
8 --------------------------------------------------------
9 D E P R E C A T E D J O B W A R N I N G
10 --------------------------------------------------------
11 This job is deprecated and is no longer supported.
12 Please DO NOT use this job in your Zuul config.
13
14 Refer to #tripleo irc channel on Freenode for more info.
diff --git a/zuul.d/deprecated-jobs.yaml b/zuul.d/deprecated-jobs.yaml
new file mode 100644
index 0000000..4ad9fe4
--- /dev/null
+++ b/zuul.d/deprecated-jobs.yaml
@@ -0,0 +1,92 @@
1---
2# zuul.d/deprecated-jobs.yaml
3# Zuul layout for TripleO deprecated jobs.
4# It contains all the deprecated jobs that should be removed from Zuul.
5
6- job:
7 name: tripleo-ci-deprecated
8 description: |
9 Deprecated TripleO Job
10 Job no longer supported that should be removed from Zuul config.
11 parent: tripleo-ci-base-multinode
12 pre-run: playbooks/deprecated/pre.yaml
13
14#TODO(rfolco): non-containeirized (nc) scenarios are no longer supported.
15# These (nc) scenario jobs ran until ocata release and should be removed
16# or replaced by containerized scenario jobs *-container.
17- job:
18 name: tripleo-ci-centos-7-scenario001-multinode-oooq
19 parent: tripleo-ci-deprecated
20 branches: none/deprecated
21 vars:
22 nodes: 1ctlr
23 featureset: '005'
24
25- job:
26 name: tripleo-ci-centos-7-scenario002-multinode-oooq
27 parent: tripleo-ci-deprecated
28 branches: none/deprecated
29 vars:
30 nodes: 1ctlr
31 featureset: '006'
32
33- job:
34 name: tripleo-ci-centos-7-scenario003-multinode-oooq
35 parent: tripleo-ci-deprecated
36 branches: none/deprecated
37 vars:
38 nodes: 1ctlr
39 featureset: '007'
40
41- job:
42 name: tripleo-ci-centos-7-scenario004-multinode-oooq
43 parent: tripleo-ci-deprecated
44 branches: none/deprecated
45 vars:
46 nodes: 1ctlr
47 featureset: '008'
48
49- job:
50 name: tripleo-ci-centos-7-scenario007-multinode-oooq
51 parent: tripleo-ci-deprecated
52 branches: none/deprecated
53 vars:
54 nodes: 1ctlr
55 featureset: '028'
56
57- job:
58 name: tripleo-ci-centos-7-scenario008-multinode-oooq
59 parent: tripleo-ci-deprecated
60 voting: false
61 branches: none/deprecated
62 vars:
63 nodes: 1ctlr
64 featureset: '031'
65
66- job:
67 name: tripleo-ci-centos-7-nonha-multinode-oooq
68 parent: tripleo-ci-deprecated
69 branches: none/deprecated
70 vars:
71 nodes: 1ctlr
72 featureset: '004'
73
74#TODO(rfolco): scen00{6,9} are containeirized, remove this when
75# all projects using them rename to the *-container (dup) jobs
76- job:
77 name: tripleo-ci-centos-7-scenario006-multinode-oooq
78 parent: tripleo-ci-deprecated
79 voting: false
80 branches: ^(?!stable/(newton|ocata)).*$
81 vars:
82 nodes: 1ctlr
83 featureset: '026'
84
85- job:
86 name: tripleo-ci-centos-7-scenario009-multinode-oooq
87 parent: tripleo-ci-deprecated
88 voting: false
89 branches: ^(?!stable/(newton|ocata)).*$
90 vars:
91 nodes: 1ctlr
92 featureset: '033'
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index a129315..ec8fd7b 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -31,27 +31,6 @@
31 - tripleo-buildimage-overcloud-hardened-full-centos-7: 31 - tripleo-buildimage-overcloud-hardened-full-centos-7:
32 files: 32 files:
33 - ^playbooks/tripleo-buildimage/.*$ 33 - ^playbooks/tripleo-buildimage/.*$
34 - tripleo-ci-centos-7-scenario001-multinode-oooq:
35 files:
36 - ^playbooks/tripleo-ci/.*$
37 - tripleo-ci-centos-7-scenario002-multinode-oooq:
38 files:
39 - ^playbooks/tripleo-ci/.*$
40 - tripleo-ci-centos-7-scenario002-multinode-oooq:
41 files:
42 - ^playbooks/tripleo-ci/.*$
43 - tripleo-ci-centos-7-scenario003-multinode-oooq:
44 files:
45 - ^playbooks/tripleo-ci/.*$
46 - tripleo-ci-centos-7-scenario004-multinode-oooq:
47 files:
48 - ^playbooks/tripleo-ci/.*$
49 - tripleo-ci-centos-7-scenario007-multinode-oooq:
50 files:
51 - ^playbooks/tripleo-ci/.*$
52 - tripleo-ci-centos-7-scenario009-multinode-oooq:
53 files:
54 - ^playbooks/tripleo-ci/.*$
55 - tripleo-ci-centos-7-scenario001-multinode-oooq-container: 34 - tripleo-ci-centos-7-scenario001-multinode-oooq-container:
56 files: 35 files:
57 - ^playbooks/tripleo-ci/.*$ 36 - ^playbooks/tripleo-ci/.*$
@@ -70,6 +49,9 @@
70 - tripleo-ci-centos-7-scenario008-multinode-oooq-container: 49 - tripleo-ci-centos-7-scenario008-multinode-oooq-container:
71 files: 50 files:
72 - ^playbooks/tripleo-ci/.*$ 51 - ^playbooks/tripleo-ci/.*$
52 - tripleo-ci-centos-7-scenario009-multinode-oooq-container:
53 files:
54 - ^playbooks/tripleo-ci/.*$
73 gate: 55 gate:
74 queue: tripleo 56 queue: tripleo
75 jobs: 57 jobs:
diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml
index 66340d5..c2fe994 100644
--- a/zuul.d/multinode-jobs.yaml
+++ b/zuul.d/multinode-jobs.yaml
@@ -7,11 +7,11 @@
7 name: tripleo-multinode-baremetal-minimal 7 name: tripleo-multinode-baremetal-minimal
8 check: 8 check:
9 jobs: 9 jobs:
10 - tripleo-ci-centos-7-nonha-multinode-oooq 10 - noop
11 gate: 11 gate:
12 queue: tripleo 12 queue: tripleo
13 jobs: 13 jobs:
14 - tripleo-ci-centos-7-nonha-multinode-oooq 14 - noop
15 15
16- project-template: 16- project-template:
17 name: tripleo-multinode-container-minimal 17 name: tripleo-multinode-container-minimal
@@ -24,7 +24,6 @@
24 - tripleo-ci-centos-7-standalone 24 - tripleo-ci-centos-7-standalone
25 - tripleo-ci-fedora-28-standalone 25 - tripleo-ci-fedora-28-standalone
26 - tripleo-ci-centos-7-standalone-upgrade 26 - tripleo-ci-centos-7-standalone-upgrade
27
28 gate: 27 gate:
29 queue: tripleo 28 queue: tripleo
30 jobs: 29 jobs:
@@ -33,6 +32,16 @@
33 - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates 32 - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates
34 33
35- project-template: 34- project-template:
35 name: tripleo-multinode-baremetal-full
36 check:
37 jobs:
38 - noop
39 gate:
40 queue: tripleo
41 jobs:
42 - noop
43
44- project-template:
36 name: tripleo-multinode-container-full 45 name: tripleo-multinode-container-full
37 check: 46 check:
38 jobs: 47 jobs:
@@ -58,30 +67,10 @@
58 - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates 67 - tripleo-ci-centos-7-scenario000-multinode-oooq-container-updates
59 68
60- project-template: 69- project-template:
61 name: tripleo-multinode-baremetal-full
62 check:
63 jobs:
64 - tripleo-ci-centos-7-nonha-multinode-oooq
65 - tripleo-ci-centos-7-scenario001-multinode-oooq
66 - tripleo-ci-centos-7-scenario002-multinode-oooq
67 - tripleo-ci-centos-7-scenario003-multinode-oooq
68 - tripleo-ci-centos-7-scenario004-multinode-oooq
69 - tripleo-ci-centos-7-scenario007-multinode-oooq
70 - tripleo-ci-centos-7-scenario009-multinode-oooq
71 gate:
72 queue: tripleo
73 jobs:
74 - tripleo-ci-centos-7-nonha-multinode-oooq
75 - tripleo-ci-centos-7-scenario001-multinode-oooq
76 - tripleo-ci-centos-7-scenario002-multinode-oooq
77 - tripleo-ci-centos-7-scenario003-multinode-oooq
78 - tripleo-ci-centos-7-scenario004-multinode-oooq
79
80- project-template:
81 name: tripleo-multinode-experimental 70 name: tripleo-multinode-experimental
82 experimental: 71 experimental:
83 jobs: 72 jobs:
84 - tripleo-ci-centos-7-scenario006-multinode-oooq 73 - tripleo-ci-centos-7-scenario006-multinode-oooq-container
85 - tripleo-ci-centos-7-scenario010-multinode-oooq-container 74 - tripleo-ci-centos-7-scenario010-multinode-oooq-container
86 - tripleo-ci-centos-7-scenario011-multinode-oooq-container 75 - tripleo-ci-centos-7-scenario011-multinode-oooq-container
87 76
@@ -150,23 +139,6 @@
150 playbooks: 139 playbooks:
151 - multinode.yml 140 - multinode.yml
152 141
153
154- job:
155 name: tripleo-ci-centos-7-nonha-multinode-oooq
156 parent: tripleo-ci-base-multinode
157 branches: ^stable/(newton|ocata).*$
158 vars:
159 nodes: 1ctlr
160 featureset: '004'
161
162- job:
163 name: tripleo-ci-centos-7-scenario001-multinode-oooq
164 parent: tripleo-ci-base-multinode
165 branches: ^stable/(newton|ocata).*$
166 vars:
167 nodes: 1ctlr
168 featureset: '005'
169
170- job: 142- job:
171 name: tripleo-ci-centos-7-scenario001-multinode-oooq-container 143 name: tripleo-ci-centos-7-scenario001-multinode-oooq-container
172 parent: tripleo-ci-base-multinode 144 parent: tripleo-ci-base-multinode
@@ -177,14 +149,6 @@
177 featureset: '016' 149 featureset: '016'
178 150
179- job: 151- job:
180 name: tripleo-ci-centos-7-scenario002-multinode-oooq
181 parent: tripleo-ci-base-multinode
182 branches: ^stable/(newton|ocata).*$
183 vars:
184 nodes: 1ctlr
185 featureset: '006'
186
187- job:
188 name: tripleo-ci-centos-7-scenario002-multinode-oooq-container 152 name: tripleo-ci-centos-7-scenario002-multinode-oooq-container
189 parent: tripleo-ci-base-multinode 153 parent: tripleo-ci-base-multinode
190 branches: ^(?!stable/(newton|ocata)).*$ 154 branches: ^(?!stable/(newton|ocata)).*$
@@ -202,14 +166,6 @@
202 featureset: '055' 166 featureset: '055'
203 167
204- job: 168- job:
205 name: tripleo-ci-centos-7-scenario003-multinode-oooq
206 parent: tripleo-ci-base-multinode
207 branches: ^stable/ocata.*$
208 vars:
209 nodes: 1ctlr
210 featureset: '007'
211
212- job:
213 name: tripleo-ci-centos-7-scenario003-multinode-oooq-container 169 name: tripleo-ci-centos-7-scenario003-multinode-oooq-container
214 parent: tripleo-ci-base-multinode 170 parent: tripleo-ci-base-multinode
215 branches: ^stable/(pike|queens|rocky).*$ 171 branches: ^stable/(pike|queens|rocky).*$
@@ -219,14 +175,6 @@
219 featureset: '018' 175 featureset: '018'
220 176
221- job: 177- job:
222 name: tripleo-ci-centos-7-scenario004-multinode-oooq
223 parent: tripleo-ci-base-multinode
224 branches: ^stable/ocata.*$
225 vars:
226 nodes: 1ctlr
227 featureset: '008'
228
229- job:
230 name: tripleo-ci-centos-7-scenario004-multinode-oooq-container 178 name: tripleo-ci-centos-7-scenario004-multinode-oooq-container
231 parent: tripleo-ci-base-multinode 179 parent: tripleo-ci-base-multinode
232 branches: ^(?!stable/(newton|ocata)).*$ 180 branches: ^(?!stable/(newton|ocata)).*$
@@ -236,7 +184,7 @@
236 featureset: '019' 184 featureset: '019'
237 185
238- job: 186- job:
239 name: tripleo-ci-centos-7-scenario006-multinode-oooq 187 name: tripleo-ci-centos-7-scenario006-multinode-oooq-container
240 parent: tripleo-ci-base-multinode 188 parent: tripleo-ci-base-multinode
241 voting: false 189 voting: false
242 branches: ^(?!stable/(newton|ocata)).*$ 190 branches: ^(?!stable/(newton|ocata)).*$
@@ -245,14 +193,6 @@
245 featureset: '026' 193 featureset: '026'
246 194
247- job: 195- job:
248 name: tripleo-ci-centos-7-scenario007-multinode-oooq
249 parent: tripleo-ci-base-multinode
250 branches: ^stable/pike.*$
251 vars:
252 nodes: 1ctlr
253 featureset: '028'
254
255- job:
256 name: tripleo-ci-centos-7-scenario007-multinode-oooq-container 196 name: tripleo-ci-centos-7-scenario007-multinode-oooq-container
257 parent: tripleo-ci-base-multinode 197 parent: tripleo-ci-base-multinode
258 voting: false 198 voting: false
@@ -271,16 +211,7 @@
271 featureset: '031' 211 featureset: '031'
272 212
273- job: 213- job:
274 name: tripleo-ci-centos-7-scenario008-multinode-oooq 214 name: tripleo-ci-centos-7-scenario009-multinode-oooq-container
275 parent: tripleo-ci-base-multinode
276 voting: false
277 branches: ^(?!stable/(newton|ocata|pike|queens)).*$
278 vars:
279 nodes: 1ctlr
280 featureset: '031'
281
282- job:
283 name: tripleo-ci-centos-7-scenario009-multinode-oooq
284 parent: tripleo-ci-base-multinode 215 parent: tripleo-ci-base-multinode
285 voting: false 216 voting: false
286 branches: ^(?!stable/(newton|ocata)).*$ 217 branches: ^(?!stable/(newton|ocata)).*$