Skip to content

Commit 6780f1e

Browse files
jlebonmike-nguyen
authored andcommitted
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 96ceb6d commit 6780f1e

22 files changed

+56
-1899
lines changed
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
build_root:
2+
project_image:
3+
dockerfile_literal: |
4+
FROM quay.io/fedora/fedora:40
5+
RUN dnf install -y git findutils
6+
RUN mkdir /go && chmod 777 /go
7+
images:
8+
- dockerfile_path: Dockerfile
9+
from: root
10+
to: bin
11+
resources:
12+
'*':
13+
requests:
14+
cpu: 1000m
15+
memory: 1Gi
16+
rhcos:
17+
limits:
18+
devices.kubevirt.io/kvm: "1"
19+
requests:
20+
cpu: 1000m
21+
devices.kubevirt.io/kvm: "1"
22+
memory: 3Gi
23+
tests:
24+
- as: rhcos
25+
commands: /usr/lib/coreos-assembler/ci/prow-rhcos.sh
26+
container:
27+
from: bin
28+
zz_generated_metadata:
29+
branch: rhcos-4.18
30+
org: coreos
31+
repo: coreos-assembler

ci-operator/config/openshift/os/openshift-os-master.yaml

Lines changed: 4 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
1-
base_images:
2-
coreos_coreos-assembler_latest:
3-
name: coreos-assembler
4-
namespace: coreos
5-
tag: latest
61
build_root:
72
image_stream_tag:
8-
name: fcos-buildroot
3+
name: coreos-assembler
94
namespace: coreos
10-
tag: testing-devel
5+
tag: latest
116
images:
127
- dockerfile_literal: |
13-
# COSA + source code
14-
FROM registry.ci.openshift.org/coreos/coreos-assembler:latest
8+
FROM overridden
159
WORKDIR /src
1610
# Tell the build scripts that we have setup a directory for unprivileged build
1711
ENV COSA_DIR=/tmp/cosa
1812
RUN mkdir -p "${COSA_DIR}"
19-
# Prow doesn't support emptydir for jobs today
20-
ENV COSA_SKIP_OVERLAY=1
2113
# Copy the source code
2214
COPY . .
2315
# We need to make sure that root can read / write to the COSA_DIR so that
@@ -29,10 +21,7 @@ images:
2921
# Go back to unprivileged user for COSA
3022
USER builder
3123
WORKDIR /tmp/cosa
32-
inputs:
33-
coreos_coreos-assembler_latest:
34-
as:
35-
- registry.ci.openshift.org/coreos/coreos-assembler:latest
24+
from: root
3625
to: build-image
3726
promotion:
3827
to:
@@ -118,56 +107,48 @@ tests:
118107
from: src
119108
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
120109
- as: rhcos-9-build-test-qemu
121-
cluster: build02
122110
commands: /src/ci/prow-entrypoint.sh rhcos-9-build-test-qemu
123111
container:
124112
from: build-image
125113
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
126114
timeout: 4h0m0s
127115
- as: rhcos-9-build-test-metal
128-
cluster: build02
129116
commands: /src/ci/prow-entrypoint.sh rhcos-9-build-test-metal
130117
container:
131118
from: build-image
132119
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
133120
timeout: 3h0m0s
134121
- as: rhcos-96-build-test-qemu
135-
cluster: build02
136122
commands: /src/ci/prow-entrypoint.sh rhcos-96-build-test-qemu
137123
container:
138124
from: build-image
139125
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
140126
timeout: 4h0m0s
141127
- as: rhcos-96-build-test-metal
142-
cluster: build02
143128
commands: /src/ci/prow-entrypoint.sh rhcos-96-build-test-metal
144129
container:
145130
from: build-image
146131
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
147132
timeout: 3h0m0s
148133
- as: scos-9-build-test-qemu
149-
cluster: build02
150134
commands: /src/ci/prow-entrypoint.sh scos-9-build-test-qemu
151135
container:
152136
from: build-image
153137
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
154138
timeout: 4h0m0s
155139
- as: scos-9-build-test-metal
156-
cluster: build02
157140
commands: /src/ci/prow-entrypoint.sh scos-9-build-test-metal
158141
container:
159142
from: build-image
160143
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
161144
timeout: 3h0m0s
162145
- as: scos-10-build-test-qemu
163-
cluster: build02
164146
commands: /src/ci/prow-entrypoint.sh scos-10-build-test-qemu
165147
container:
166148
from: build-image
167149
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
168150
timeout: 4h0m0s
169151
- as: scos-10-build-test-metal
170-
cluster: build02
171152
commands: /src/ci/prow-entrypoint.sh scos-10-build-test-metal
172153
container:
173154
from: build-image

ci-operator/config/openshift/os/openshift-os-release-4.10.yaml

Lines changed: 0 additions & 60 deletions
This file was deleted.

ci-operator/config/openshift/os/openshift-os-release-4.11.yaml

Lines changed: 0 additions & 96 deletions
This file was deleted.

0 commit comments

Comments
 (0)