Commit ff57cda
Various cleanups for CoreOS-related things (openshift#59000)
* openshift/os: simplify image definitions
First, stop using the `fcos-buildroot` image. It's no longer defined in
this repo and we don't strictly need it.
Instead, use cosa as the buildroot. This then allows us to get rid of
the redundant `base_images` definition, and use the `root` image as our
`from`.
Use `FROM overridden` in the Dockerfile literal to make it clear that
it's always going to be overridden anyway.
* openshift/os: no longer limit tests to build02
As per openshift/os#1551 (comment)
we should no longer have to limit tests to the build02 cluster since
OpenShift CNV was installed on all the build clusters.
This should make it easier for our jobs to get scheduled.
* openshift/os: nuke configs for branches < 4.12
We don't care about those branches anymore and they should not be
receiving any new content.
* image-mirroring: stop mirroring coreos-assembler for releases < 4.12
We don't care about those tags anymore and they should no longer be
used.
* supplemental-ci-images: drop unused images and buildconfigs
We ended up not really using these images. Just delete them. We can
always readd those we need in the future.
* openshift/os: drop COSA_SKIP_OVERLAY=1 workaround
This is no longer required after:
coreos/coreos-assembler#3936
* core-services/image-mirroring: Mirror 4.18 image for COSA
* ci-operator/openshift/os: 4.18 use 4.18 cosa
* ci-operator/coreos/coreos-assembler: Add CI for 4.18 branch
* openshift/os: drop testing of SCOS and RHCOS 9.6 on 4.18
These are no longer relevant for 4.18, so nuke them.
---------
Co-authored-by: Michael Nguyen <[email protected]>1 parent 42d5efc commit ff57cda
File tree
22 files changed
+56
-1899
lines changed- ci-operator
- config
- coreos/coreos-assembler
- openshift/os
- jobs
- coreos/coreos-assembler
- openshift/os
- clusters/app.ci/supplemental-ci-images/coreos
- core-services/image-mirroring
22 files changed
+56
-1899
lines changedLines changed: 31 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
| 8 | + | |
| 9 | + | |
| 10 | + | |
| 11 | + | |
| 12 | + | |
| 13 | + | |
| 14 | + | |
| 15 | + | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | | - | |
2 | | - | |
3 | | - | |
4 | | - | |
5 | | - | |
6 | 1 | | |
7 | 2 | | |
8 | | - | |
| 3 | + | |
9 | 4 | | |
10 | | - | |
| 5 | + | |
11 | 6 | | |
12 | 7 | | |
13 | | - | |
14 | | - | |
| 8 | + | |
15 | 9 | | |
16 | 10 | | |
17 | 11 | | |
18 | 12 | | |
19 | | - | |
20 | | - | |
21 | 13 | | |
22 | 14 | | |
23 | 15 | | |
| |||
29 | 21 | | |
30 | 22 | | |
31 | 23 | | |
32 | | - | |
33 | | - | |
34 | | - | |
35 | | - | |
| 24 | + | |
36 | 25 | | |
37 | 26 | | |
38 | 27 | | |
| |||
118 | 107 | | |
119 | 108 | | |
120 | 109 | | |
121 | | - | |
122 | 110 | | |
123 | 111 | | |
124 | 112 | | |
125 | 113 | | |
126 | 114 | | |
127 | 115 | | |
128 | | - | |
129 | 116 | | |
130 | 117 | | |
131 | 118 | | |
132 | 119 | | |
133 | 120 | | |
134 | 121 | | |
135 | | - | |
136 | 122 | | |
137 | 123 | | |
138 | 124 | | |
139 | 125 | | |
140 | 126 | | |
141 | 127 | | |
142 | | - | |
143 | 128 | | |
144 | 129 | | |
145 | 130 | | |
146 | 131 | | |
147 | 132 | | |
148 | 133 | | |
149 | | - | |
150 | 134 | | |
151 | 135 | | |
152 | 136 | | |
153 | 137 | | |
154 | 138 | | |
155 | 139 | | |
156 | | - | |
157 | 140 | | |
158 | 141 | | |
159 | 142 | | |
160 | 143 | | |
161 | 144 | | |
162 | 145 | | |
163 | | - | |
164 | 146 | | |
165 | 147 | | |
166 | 148 | | |
167 | 149 | | |
168 | 150 | | |
169 | 151 | | |
170 | | - | |
171 | 152 | | |
172 | 153 | | |
173 | 154 | | |
| |||
Lines changed: 0 additions & 60 deletions
This file was deleted.
Lines changed: 0 additions & 96 deletions
This file was deleted.
0 commit comments