Skip to content

openshift/os: drop rhcos-96* tests; create rhcos-9next tests #61527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 12, 2025
Merged

openshift/os: drop rhcos-96* tests; create rhcos-9next tests #61527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions ci-operator/config/openshift/os/openshift-os-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,28 +77,28 @@ resources:
cpu: 2000m
devices.kubevirt.io/kvm: "1"
memory: 3Gi
rhcos-10-build-test-metal:
rhcos-9next-build-test-metal:
limits:
devices.kubevirt.io/kvm: "1"
requests:
cpu: 2000m
devices.kubevirt.io/kvm: "1"
memory: 3Gi
rhcos-10-build-test-qemu:
rhcos-9next-build-test-qemu:
limits:
devices.kubevirt.io/kvm: "1"
requests:
cpu: 2000m
devices.kubevirt.io/kvm: "1"
memory: 3Gi
rhcos-96-build-test-metal:
rhcos-10-build-test-metal:
limits:
devices.kubevirt.io/kvm: "1"
requests:
cpu: 2000m
devices.kubevirt.io/kvm: "1"
memory: 3Gi
rhcos-96-build-test-qemu:
rhcos-10-build-test-qemu:
limits:
devices.kubevirt.io/kvm: "1"
requests:
Expand Down Expand Up @@ -151,14 +151,14 @@ tests:
from: build-image
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
timeout: 3h0m0s
- as: rhcos-96-build-test-qemu
commands: /src/ci/prow-entrypoint.sh rhcos-96-build-test-qemu
- as: rhcos-9next-build-test-qemu
commands: /src/ci/prow-entrypoint.sh rhcos-9next-build-test-qemu
container:
from: build-image
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
timeout: 4h0m0s
- as: rhcos-96-build-test-metal
commands: /src/ci/prow-entrypoint.sh rhcos-96-build-test-metal
- as: rhcos-9next-build-test-metal
commands: /src/ci/prow-entrypoint.sh rhcos-9next-build-test-metal
container:
from: build-image
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
Expand Down
20 changes: 10 additions & 10 deletions ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ presubmits:
- ^master$
- ^master-
cluster: build02
context: ci/prow/rhcos-96-build-test-metal
context: ci/prow/rhcos-9next-build-test-metal
decorate: true
decoration_config:
skip_cloning: true
Expand All @@ -264,16 +264,16 @@ presubmits:
ci.openshift.io/generator: prowgen
devices.kubevirt.io/kvm: "1"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-os-master-rhcos-96-build-test-metal
rerun_command: /test rhcos-96-build-test-metal
name: pull-ci-openshift-os-master-rhcos-9next-build-test-metal
rerun_command: /test rhcos-9next-build-test-metal
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --target=rhcos-96-build-test-metal
- --target=rhcos-9next-build-test-metal
command:
- ci-operator
image: ci-operator:latest
Expand Down Expand Up @@ -306,14 +306,14 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )rhcos-96-build-test-metal,?($|\s.*)
trigger: (?m)^/test( | .* )rhcos-9next-build-test-metal,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^master$
- ^master-
cluster: build02
context: ci/prow/rhcos-96-build-test-qemu
context: ci/prow/rhcos-9next-build-test-qemu
decorate: true
decoration_config:
skip_cloning: true
Expand All @@ -322,16 +322,16 @@ presubmits:
ci.openshift.io/generator: prowgen
devices.kubevirt.io/kvm: "1"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-os-master-rhcos-96-build-test-qemu
rerun_command: /test rhcos-96-build-test-qemu
name: pull-ci-openshift-os-master-rhcos-9next-build-test-qemu
rerun_command: /test rhcos-9next-build-test-qemu
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
spec:
containers:
- args:
- --gcs-upload-secret=/secrets/gcs/service-account.json
- --image-import-pull-secret=/etc/pull-secret/.dockerconfigjson
- --report-credentials-file=/etc/report/credentials
- --target=rhcos-96-build-test-qemu
- --target=rhcos-9next-build-test-qemu
command:
- ci-operator
image: ci-operator:latest
Expand Down Expand Up @@ -364,7 +364,7 @@ presubmits:
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )rhcos-96-build-test-qemu,?($|\s.*)
trigger: (?m)^/test( | .* )rhcos-9next-build-test-qemu,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down