Skip to content

Commit

Permalink
config/openshift/os: drop SCOS tests on 4.17 (#55836)
Browse files Browse the repository at this point in the history
We only test SCOS on master. Follow-up to ae3c332 ("Add 4.17
coreos-assembler for 4.18 branching (#55547)").
  • Loading branch information
jlebon authored Aug 21, 2024
1 parent c0494f2 commit 9d61a2f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 146 deletions.
28 changes: 0 additions & 28 deletions ci-operator/config/openshift/os/openshift-os-release-4.17.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,20 +69,6 @@ resources:
cpu: 2000m
devices.kubevirt.io/kvm: "1"
memory: 3Gi
scos-9-build-test-metal:
limits:
devices.kubevirt.io/kvm: "1"
requests:
cpu: 2000m
devices.kubevirt.io/kvm: "1"
memory: 3Gi
scos-9-build-test-qemu:
limits:
devices.kubevirt.io/kvm: "1"
requests:
cpu: 2000m
devices.kubevirt.io/kvm: "1"
memory: 3Gi
tests:
- as: validate
commands: ci/prow-entrypoint.sh validate
Expand All @@ -103,20 +89,6 @@ tests:
from: build-image
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
timeout: 3h0m0s
- as: scos-9-build-test-qemu
cluster: build02
commands: /src/ci/prow-entrypoint.sh scos-9-build-test-qemu
container:
from: build-image
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
timeout: 4h0m0s
- as: scos-9-build-test-metal
cluster: build02
commands: /src/ci/prow-entrypoint.sh scos-9-build-test-metal
container:
from: build-image
skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
timeout: 3h0m0s
zz_generated_metadata:
branch: release-4.17
org: openshift
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,124 +175,6 @@ presubmits:
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )rhcos-9-build-test-qemu,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^release-4\.17$
- ^release-4\.17-
cluster: build02
context: ci/prow/scos-9-build-test-metal
decorate: true
decoration_config:
skip_cloning: true
timeout: 3h0m0s
labels:
ci-operator.openshift.io/cluster: build02
ci.openshift.io/generator: prowgen
devices.kubevirt.io/kvm: "1"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-os-release-4.17-scos-9-build-test-metal
rerun_command: /test scos-9-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=scos-9-build-test-metal
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )scos-9-build-test-metal,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
- ^release-4\.17$
- ^release-4\.17-
cluster: build02
context: ci/prow/scos-9-build-test-qemu
decorate: true
decoration_config:
skip_cloning: true
timeout: 4h0m0s
labels:
ci-operator.openshift.io/cluster: build02
ci.openshift.io/generator: prowgen
devices.kubevirt.io/kvm: "1"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-os-release-4.17-scos-9-build-test-qemu
rerun_command: /test scos-9-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=scos-9-build-test-qemu
command:
- ci-operator
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /secrets/gcs
name: gcs-credentials
readOnly: true
- mountPath: /secrets/manifest-tool
name: manifest-tool-local-pusher
readOnly: true
- mountPath: /etc/pull-secret
name: pull-secret
readOnly: true
- mountPath: /etc/report
name: result-aggregator
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: manifest-tool-local-pusher
secret:
secretName: manifest-tool-local-pusher
- name: pull-secret
secret:
secretName: registry-pull-credentials
- name: result-aggregator
secret:
secretName: result-aggregator
trigger: (?m)^/test( | .* )scos-9-build-test-qemu,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down

0 comments on commit 9d61a2f

Please sign in to comment.