Skip to content

Commit bb95ab6

Browse files
dustymabephani2898
authored andcommitted
openshift/os: drop rhcos-96* tests; create rhcos-9next tests (openshift#61527)
In the future we'll use the rhcos-9next tests when proofing out a new RHEL minor version. This will prevent us from having to update it here as much.
1 parent 2d7d102 commit bb95ab6

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

Diff for: ci-operator/config/openshift/os/openshift-os-master.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -77,28 +77,28 @@ resources:
7777
cpu: 2000m
7878
devices.kubevirt.io/kvm: "1"
7979
memory: 3Gi
80-
rhcos-10-build-test-metal:
80+
rhcos-9next-build-test-metal:
8181
limits:
8282
devices.kubevirt.io/kvm: "1"
8383
requests:
8484
cpu: 2000m
8585
devices.kubevirt.io/kvm: "1"
8686
memory: 3Gi
87-
rhcos-10-build-test-qemu:
87+
rhcos-9next-build-test-qemu:
8888
limits:
8989
devices.kubevirt.io/kvm: "1"
9090
requests:
9191
cpu: 2000m
9292
devices.kubevirt.io/kvm: "1"
9393
memory: 3Gi
94-
rhcos-96-build-test-metal:
94+
rhcos-10-build-test-metal:
9595
limits:
9696
devices.kubevirt.io/kvm: "1"
9797
requests:
9898
cpu: 2000m
9999
devices.kubevirt.io/kvm: "1"
100100
memory: 3Gi
101-
rhcos-96-build-test-qemu:
101+
rhcos-10-build-test-qemu:
102102
limits:
103103
devices.kubevirt.io/kvm: "1"
104104
requests:
@@ -151,14 +151,14 @@ tests:
151151
from: build-image
152152
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
153153
timeout: 3h0m0s
154-
- as: rhcos-96-build-test-qemu
155-
commands: /src/ci/prow-entrypoint.sh rhcos-96-build-test-qemu
154+
- as: rhcos-9next-build-test-qemu
155+
commands: /src/ci/prow-entrypoint.sh rhcos-9next-build-test-qemu
156156
container:
157157
from: build-image
158158
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
159159
timeout: 4h0m0s
160-
- as: rhcos-96-build-test-metal
161-
commands: /src/ci/prow-entrypoint.sh rhcos-96-build-test-metal
160+
- as: rhcos-9next-build-test-metal
161+
commands: /src/ci/prow-entrypoint.sh rhcos-9next-build-test-metal
162162
container:
163163
from: build-image
164164
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$

Diff for: ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ presubmits:
255255
- ^master$
256256
- ^master-
257257
cluster: build02
258-
context: ci/prow/rhcos-96-build-test-metal
258+
context: ci/prow/rhcos-9next-build-test-metal
259259
decorate: true
260260
decoration_config:
261261
skip_cloning: true
@@ -264,16 +264,16 @@ presubmits:
264264
ci.openshift.io/generator: prowgen
265265
devices.kubevirt.io/kvm: "1"
266266
pj-rehearse.openshift.io/can-be-rehearsed: "true"
267-
name: pull-ci-openshift-os-master-rhcos-96-build-test-metal
268-
rerun_command: /test rhcos-96-build-test-metal
267+
name: pull-ci-openshift-os-master-rhcos-9next-build-test-metal
268+
rerun_command: /test rhcos-9next-build-test-metal
269269
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
270270
spec:
271271
containers:
272272
- args:
273273
- --gcs-upload-secret=/secrets/gcs/service-account.json
274274
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
275275
- --report-credentials-file=/etc/report/credentials
276-
- --target=rhcos-96-build-test-metal
276+
- --target=rhcos-9next-build-test-metal
277277
command:
278278
- ci-operator
279279
image: ci-operator:latest
@@ -306,14 +306,14 @@ presubmits:
306306
- name: result-aggregator
307307
secret:
308308
secretName: result-aggregator
309-
trigger: (?m)^/test( | .* )rhcos-96-build-test-metal,?($|\s.*)
309+
trigger: (?m)^/test( | .* )rhcos-9next-build-test-metal,?($|\s.*)
310310
- agent: kubernetes
311311
always_run: false
312312
branches:
313313
- ^master$
314314
- ^master-
315315
cluster: build02
316-
context: ci/prow/rhcos-96-build-test-qemu
316+
context: ci/prow/rhcos-9next-build-test-qemu
317317
decorate: true
318318
decoration_config:
319319
skip_cloning: true
@@ -322,16 +322,16 @@ presubmits:
322322
ci.openshift.io/generator: prowgen
323323
devices.kubevirt.io/kvm: "1"
324324
pj-rehearse.openshift.io/can-be-rehearsed: "true"
325-
name: pull-ci-openshift-os-master-rhcos-96-build-test-qemu
326-
rerun_command: /test rhcos-96-build-test-qemu
325+
name: pull-ci-openshift-os-master-rhcos-9next-build-test-qemu
326+
rerun_command: /test rhcos-9next-build-test-qemu
327327
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
328328
spec:
329329
containers:
330330
- args:
331331
- --gcs-upload-secret=/secrets/gcs/service-account.json
332332
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
333333
- --report-credentials-file=/etc/report/credentials
334-
- --target=rhcos-96-build-test-qemu
334+
- --target=rhcos-9next-build-test-qemu
335335
command:
336336
- ci-operator
337337
image: ci-operator:latest
@@ -364,7 +364,7 @@ presubmits:
364364
- name: result-aggregator
365365
secret:
366366
secretName: result-aggregator
367-
trigger: (?m)^/test( | .* )rhcos-96-build-test-qemu,?($|\s.*)
367+
trigger: (?m)^/test( | .* )rhcos-9next-build-test-qemu,?($|\s.*)
368368
- agent: kubernetes
369369
always_run: false
370370
branches:

0 commit comments

Comments
 (0)