Commit 00d7b3f
committed
ci-operator/templates/openshift: Use IMAGE_TESTS for teardown gzip
The teardown container requires oc (for retrieving cluster logs), gzip
(for compressing those logs), and openshift-install (for destroying
the cluster). We were already copying in oc from another container;
with this commit we copy in the statically-linked openshift-install
too. That leaves gzip, which we will be built in to IMAGE_TESTS as "a
command needed in the CI-test context". Using IMAGE_TESTS for
teardown means we no longer need to copy oc into the shared volume for
the teardown container (although we may need to copy it in for other
containers, e.g. the src template's test container).
I've also dropped an unnecessary /bin/ prefix from the 'create
cluster' invocations, which we'd been dragging around from the
pre-shell days of 3f2f01c
(ci-operator/config/openshift/installer/master: Move to
openshift-install, 2018-09-26, #1677).1 parent e0a8e85 commit 00d7b3f
File tree
3 files changed
+12
-9
lines changed- ci-operator/templates/openshift
- installer
- openshift-ansible
3 files changed
+12
-9
lines changedLines changed: 3 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
115 | 115 | | |
116 | 116 | | |
117 | 117 | | |
118 | | - | |
119 | | - | |
120 | 118 | | |
121 | 119 | | |
122 | 120 | | |
| |||
241 | 239 | | |
242 | 240 | | |
243 | 241 | | |
| 242 | + | |
244 | 243 | | |
245 | 244 | | |
246 | 245 | | |
| |||
303 | 302 | | |
304 | 303 | | |
305 | 304 | | |
306 | | - | |
| 305 | + | |
307 | 306 | | |
308 | 307 | | |
309 | 308 | | |
310 | 309 | | |
311 | | - | |
| 310 | + | |
312 | 311 | | |
313 | 312 | | |
314 | 313 | | |
| |||
Lines changed: 5 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| 21 | + | |
| 22 | + | |
21 | 23 | | |
22 | 24 | | |
23 | 25 | | |
| |||
211 | 213 | | |
212 | 214 | | |
213 | 215 | | |
| 216 | + | |
214 | 217 | | |
215 | 218 | | |
216 | 219 | | |
| |||
273 | 276 | | |
274 | 277 | | |
275 | 278 | | |
276 | | - | |
| 279 | + | |
277 | 280 | | |
278 | 281 | | |
279 | 282 | | |
280 | 283 | | |
281 | | - | |
| 284 | + | |
282 | 285 | | |
283 | 286 | | |
284 | 287 | | |
| |||
Lines changed: 4 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
121 | | - | |
| 121 | + | |
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
| |||
304 | 304 | | |
305 | 305 | | |
306 | 306 | | |
| 307 | + | |
307 | 308 | | |
308 | 309 | | |
309 | 310 | | |
| |||
366 | 367 | | |
367 | 368 | | |
368 | 369 | | |
369 | | - | |
| 370 | + | |
370 | 371 | | |
371 | 372 | | |
372 | 373 | | |
| |||
411 | 412 | | |
412 | 413 | | |
413 | 414 | | |
414 | | - | |
| 415 | + | |
415 | 416 | | |
416 | 417 | | |
417 | 418 | | |
| |||
0 commit comments