summaryrefslogtreecommitdiff
path: root/zuul.d
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-15 09:22:17 +0000
committerGerrit Code Review <review@openstack.org>2018-10-15 09:22:17 +0000
commitc010de0de72b2465af6fa23a9236f381d7b69e2a (patch)
tree7c285a40e67c5d674547438321d385999ca37d85 /zuul.d
parentc4d6e0a56814f397549efd901ca693709383c948 (diff)
parent76e73fe799ec2433565716f631aabb49007cbbdf (diff)
Merge "Move environment_type to the new base jobs"HEADmaster
Diffstat (limited to 'zuul.d')
-rw-r--r--zuul.d/base.yaml4
-rw-r--r--zuul.d/multinode-jobs.yaml25
-rw-r--r--zuul.d/standalone-jobs.yaml1
-rw-r--r--zuul.d/undercloud-jobs.yaml4
4 files changed, 4 insertions, 30 deletions
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 09c25ef..182e5d3 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -59,6 +59,7 @@
59 vars: 59 vars:
60 undercloud: 127.0.0.2 60 undercloud: 127.0.0.2
61 environment_infra: osinfra 61 environment_infra: osinfra
62 environment_type: multinode
62 common_featureset: featureset-multinode-common.yml 63 common_featureset: featureset-multinode-common.yml
63 playbooks: 64 playbooks:
64 - quickstart.yml 65 - quickstart.yml
@@ -92,6 +93,7 @@
92 vars: 93 vars:
93 undercloud: undercloud 94 undercloud: undercloud
94 environment_infra: ovb 95 environment_infra: ovb
96 environment_type: ovb
95 playbooks: 97 playbooks:
96 - ovb-setup.yml 98 - ovb-setup.yml
97 - baremetal-full-undercloud.yml 99 - baremetal-full-undercloud.yml
@@ -111,6 +113,7 @@
111 vars: 113 vars:
112 undercloud: 127.0.0.2 114 undercloud: 127.0.0.2
113 environment_infra: osinfra 115 environment_infra: osinfra
116 environment_type: singlenode
114 common_featureset: featureset-multinode-common.yml 117 common_featureset: featureset-multinode-common.yml
115 playbooks: 118 playbooks:
116 - quickstart.yml 119 - quickstart.yml
@@ -138,6 +141,7 @@
138 vars: 141 vars:
139 undercloud: 127.0.0.2 142 undercloud: 127.0.0.2
140 environment_infra: osinfra 143 environment_infra: osinfra
144 environment_type: standalone
141 common_featureset: featureset-multinode-common.yml 145 common_featureset: featureset-multinode-common.yml
142 playbooks: 146 playbooks:
143 - quickstart.yml 147 - quickstart.yml
diff --git a/zuul.d/multinode-jobs.yaml b/zuul.d/multinode-jobs.yaml
index 17b0a30..abb8ac7 100644
--- a/zuul.d/multinode-jobs.yaml
+++ b/zuul.d/multinode-jobs.yaml
@@ -99,7 +99,6 @@
99 nodeset: three-centos-7-nodes 99 nodeset: three-centos-7-nodes
100 branches: ^(?!stable/(newton|ocata|pike)).*$ 100 branches: ^(?!stable/(newton|ocata|pike)).*$
101 vars: 101 vars:
102 environment_type: multinode
103 nodes: 2ctlr 102 nodes: 2ctlr
104 featureset: '032' 103 featureset: '032'
105 104
@@ -108,7 +107,6 @@
108 parent: tripleo-ci-base-multinode 107 parent: tripleo-ci-base-multinode
109 branches: ^(?!stable/(newton|ocata)).*$ 108 branches: ^(?!stable/(newton|ocata)).*$
110 vars: 109 vars:
111 environment_type: multinode
112 nodes: 1ctlr 110 nodes: 1ctlr
113 featureset: '010' 111 featureset: '010'
114 playbooks: 112 playbooks:
@@ -122,7 +120,6 @@
122 branches: master 120 branches: master
123 vars: 121 vars:
124 branch_override: 'stable/rocky' 122 branch_override: 'stable/rocky'
125 environment_type: multinode
126 nodes: 1ctlr 123 nodes: 1ctlr
127 featureset: '010' 124 featureset: '010'
128 playbooks: 125 playbooks:
@@ -135,7 +132,6 @@
135 branches: master 132 branches: master
136 vars: 133 vars:
137 branch_override: 'stable/queens' 134 branch_override: 'stable/queens'
138 environment_type: multinode
139 nodes: 1ctlr 135 nodes: 1ctlr
140 featureset: '010' 136 featureset: '010'
141 playbooks: 137 playbooks:
@@ -148,7 +144,6 @@
148 branches: master 144 branches: master
149 vars: 145 vars:
150 branch_override: 'stable/pike' 146 branch_override: 'stable/pike'
151 environment_type: multinode
152 nodes: 1ctlr 147 nodes: 1ctlr
153 featureset: '010' 148 featureset: '010'
154 playbooks: 149 playbooks:
@@ -160,7 +155,6 @@
160 parent: tripleo-ci-base-multinode 155 parent: tripleo-ci-base-multinode
161 branches: ^stable/(newton|ocata).*$ 156 branches: ^stable/(newton|ocata).*$
162 vars: 157 vars:
163 environment_type: multinode
164 nodes: 1ctlr 158 nodes: 1ctlr
165 featureset: '004' 159 featureset: '004'
166 160
@@ -169,7 +163,6 @@
169 parent: tripleo-ci-base-multinode 163 parent: tripleo-ci-base-multinode
170 branches: ^stable/(newton|ocata).*$ 164 branches: ^stable/(newton|ocata).*$
171 vars: 165 vars:
172 environment_type: multinode
173 nodes: 1ctlr 166 nodes: 1ctlr
174 featureset: '005' 167 featureset: '005'
175 168
@@ -178,7 +171,6 @@
178 parent: tripleo-ci-base-multinode 171 parent: tripleo-ci-base-multinode
179 branches: ^(?!stable/(newton|ocata)).*$ 172 branches: ^(?!stable/(newton|ocata)).*$
180 vars: 173 vars:
181 environment_type: multinode
182 nodes: 1ctlr 174 nodes: 1ctlr
183 featureset: '016' 175 featureset: '016'
184 176
@@ -187,7 +179,6 @@
187 parent: tripleo-ci-base-multinode 179 parent: tripleo-ci-base-multinode
188 branches: ^stable/(newton|ocata).*$ 180 branches: ^stable/(newton|ocata).*$
189 vars: 181 vars:
190 environment_type: multinode
191 nodes: 1ctlr 182 nodes: 1ctlr
192 featureset: '006' 183 featureset: '006'
193 184
@@ -196,7 +187,6 @@
196 parent: tripleo-ci-base-multinode 187 parent: tripleo-ci-base-multinode
197 branches: ^(?!stable/(newton|ocata)).*$ 188 branches: ^(?!stable/(newton|ocata)).*$
198 vars: 189 vars:
199 environment_type: multinode
200 nodes: 1ctlr 190 nodes: 1ctlr
201 featureset: '017' 191 featureset: '017'
202 192
@@ -205,7 +195,6 @@
205 parent: tripleo-ci-base-multinode 195 parent: tripleo-ci-base-multinode
206 branches: ^(?!stable/(newton)).*$ 196 branches: ^(?!stable/(newton)).*$
207 vars: 197 vars:
208 environment_type: multinode
209 nodes: 1ctlr 198 nodes: 1ctlr
210 featureset: '055' 199 featureset: '055'
211 200
@@ -214,7 +203,6 @@
214 parent: tripleo-ci-base-multinode 203 parent: tripleo-ci-base-multinode
215 branches: ^stable/ocata.*$ 204 branches: ^stable/ocata.*$
216 vars: 205 vars:
217 environment_type: multinode
218 nodes: 1ctlr 206 nodes: 1ctlr
219 featureset: '007' 207 featureset: '007'
220 208
@@ -223,7 +211,6 @@
223 parent: tripleo-ci-base-multinode 211 parent: tripleo-ci-base-multinode
224 branches: ^(?!stable/(newton|ocata)).*$ 212 branches: ^(?!stable/(newton|ocata)).*$
225 vars: 213 vars:
226 environment_type: multinode
227 nodes: 1ctlr 214 nodes: 1ctlr
228 featureset: '018' 215 featureset: '018'
229 216
@@ -232,7 +219,6 @@
232 parent: tripleo-ci-base-multinode 219 parent: tripleo-ci-base-multinode
233 branches: ^stable/ocata.*$ 220 branches: ^stable/ocata.*$
234 vars: 221 vars:
235 environment_type: multinode
236 nodes: 1ctlr 222 nodes: 1ctlr
237 featureset: '008' 223 featureset: '008'
238 224
@@ -241,7 +227,6 @@
241 parent: tripleo-ci-base-multinode 227 parent: tripleo-ci-base-multinode
242 branches: ^(?!stable/(newton|ocata)).*$ 228 branches: ^(?!stable/(newton|ocata)).*$
243 vars: 229 vars:
244 environment_type: multinode
245 nodes: 1ctlr 230 nodes: 1ctlr
246 featureset: '019' 231 featureset: '019'
247 232
@@ -251,7 +236,6 @@
251 voting: false 236 voting: false
252 branches: ^(?!stable/(newton|ocata)).*$ 237 branches: ^(?!stable/(newton|ocata)).*$
253 vars: 238 vars:
254 environment_type: multinode
255 nodes: 1ctlr 239 nodes: 1ctlr
256 featureset: '026' 240 featureset: '026'
257 241
@@ -260,7 +244,6 @@
260 parent: tripleo-ci-base-multinode 244 parent: tripleo-ci-base-multinode
261 branches: ^stable/pike.*$ 245 branches: ^stable/pike.*$
262 vars: 246 vars:
263 environment_type: multinode
264 nodes: 1ctlr 247 nodes: 1ctlr
265 featureset: '028' 248 featureset: '028'
266 249
@@ -270,7 +253,6 @@
270 voting: false 253 voting: false
271 branches: ^(?!stable/(newton|ocata|pike)).*$ 254 branches: ^(?!stable/(newton|ocata|pike)).*$
272 vars: 255 vars:
273 environment_type: multinode
274 nodes: 1ctlr 256 nodes: 1ctlr
275 featureset: '030' 257 featureset: '030'
276 258
@@ -280,7 +262,6 @@
280 voting: false 262 voting: false
281 branches: ^(?!stable/(newton|ocata|pike)).*$ 263 branches: ^(?!stable/(newton|ocata|pike)).*$
282 vars: 264 vars:
283 environment_type: multinode
284 nodes: 1ctlr 265 nodes: 1ctlr
285 featureset: '031' 266 featureset: '031'
286 267
@@ -290,7 +271,6 @@
290 voting: false 271 voting: false
291 branches: ^(?!stable/(newton|ocata|pike|queens)).*$ 272 branches: ^(?!stable/(newton|ocata|pike|queens)).*$
292 vars: 273 vars:
293 environment_type: multinode
294 nodes: 1ctlr 274 nodes: 1ctlr
295 featureset: '031' 275 featureset: '031'
296 276
@@ -300,7 +280,6 @@
300 voting: false 280 voting: false
301 branches: ^(?!stable/(newton|ocata)).*$ 281 branches: ^(?!stable/(newton|ocata)).*$
302 vars: 282 vars:
303 environment_type: multinode
304 nodes: 1ctlr 283 nodes: 1ctlr
305 featureset: '033' 284 featureset: '033'
306 285
@@ -310,7 +289,6 @@
310 voting: false 289 voting: false
311 branches: ^(?!stable/(newton|ocata|pike)).*$ 290 branches: ^(?!stable/(newton|ocata|pike)).*$
312 vars: 291 vars:
313 environment_type: multinode
314 nodes: 1ctlr 292 nodes: 1ctlr
315 featureset: '038' 293 featureset: '038'
316 294
@@ -322,7 +300,6 @@
322 voting: true 300 voting: true
323 branches: ^(?!stable/(newton|ocata|pike|queens)).*$ 301 branches: ^(?!stable/(newton|ocata|pike|queens)).*$
324 vars: 302 vars:
325 environment_type: multinode
326 nodes: 1ctlr 303 nodes: 1ctlr
327 featureset: '037' 304 featureset: '037'
328 # Note (dmsimard): This enforces a minimum TTL for DNS records, see 305 # Note (dmsimard): This enforces a minimum TTL for DNS records, see
@@ -335,7 +312,6 @@
335 voting: false 312 voting: false
336 branches: ^(?!stable/(newton|ocata)).*$ 313 branches: ^(?!stable/(newton|ocata)).*$
337 vars: 314 vars:
338 environment_type: multinode
339 nodes: 1ctlr 315 nodes: 1ctlr
340 featureset: '044' 316 featureset: '044'
341 317
@@ -351,6 +327,5 @@
351 voting: false 327 voting: false
352 branches: ^(?!stable/(newton|ocata|pike)).*$ 328 branches: ^(?!stable/(newton|ocata|pike)).*$
353 vars: 329 vars:
354 environment_type: multinode
355 nodes: 1ctlr 330 nodes: 1ctlr
356 featureset: '051' 331 featureset: '051'
diff --git a/zuul.d/standalone-jobs.yaml b/zuul.d/standalone-jobs.yaml
index 7e79b83..24c1a07 100644
--- a/zuul.d/standalone-jobs.yaml
+++ b/zuul.d/standalone-jobs.yaml
@@ -9,5 +9,4 @@
9 nodeset: single-centos-7-node 9 nodeset: single-centos-7-node
10 branches: ^(?!stable/(newton|ocata|pike|queens)).*$ 10 branches: ^(?!stable/(newton|ocata|pike|queens)).*$
11 vars: 11 vars:
12 environment_type: standalone
13 featureset: '052' 12 featureset: '052'
diff --git a/zuul.d/undercloud-jobs.yaml b/zuul.d/undercloud-jobs.yaml
index 057789b..2784222 100644
--- a/zuul.d/undercloud-jobs.yaml
+++ b/zuul.d/undercloud-jobs.yaml
@@ -23,7 +23,6 @@
23 nodeset: single-centos-7-node 23 nodeset: single-centos-7-node
24 branches: ^(?!stable/(newton|ocata|pike|queens)).*$ 24 branches: ^(?!stable/(newton|ocata|pike|queens)).*$
25 vars: 25 vars:
26 environment_type: singlenode
27 featureset: '027' 26 featureset: '027'
28 27
29- job: 28- job:
@@ -32,7 +31,6 @@
32 nodeset: single-centos-7-node 31 nodeset: single-centos-7-node
33 branches: ^(stable/(newton|ocata|pike|queens|rocky)).*$ 32 branches: ^(stable/(newton|ocata|pike|queens|rocky)).*$
34 vars: 33 vars:
35 environment_type: singlenode
36 featureset: '003' 34 featureset: '003'
37 35
38- job: 36- job:
@@ -41,7 +39,6 @@
41 nodeset: single-centos-7-node 39 nodeset: single-centos-7-node
42 branches: ^(?!stable/(newton|ocata)).*$ 40 branches: ^(?!stable/(newton|ocata)).*$
43 vars: 41 vars:
44 environment_type: singlenode
45 featureset: '047' 42 featureset: '047'
46 43
47- job: 44- job:
@@ -53,5 +50,4 @@
53 # https://review.openstack.org/#/c/608282/ 50 # https://review.openstack.org/#/c/608282/
54 voting: false 51 voting: false
55 vars: 52 vars:
56 environment_type: singlenode
57 featureset: '050' 53 featureset: '050'