diff --git a/ci-operator/config/openshift/os/openshift-os-release-4.17.yaml b/ci-operator/config/openshift/os/openshift-os-release-4.17.yaml index 8e7ec0448570..d9bab0bfb7d1 100644 --- a/ci-operator/config/openshift/os/openshift-os-release-4.17.yaml +++ b/ci-operator/config/openshift/os/openshift-os-release-4.17.yaml @@ -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 @@ -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 diff --git a/ci-operator/jobs/openshift/os/openshift-os-release-4.17-presubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-release-4.17-presubmits.yaml index 23b4ab06ed01..2f275d48a35e 100644 --- a/ci-operator/jobs/openshift/os/openshift-os-release-4.17-presubmits.yaml +++ b/ci-operator/jobs/openshift/os/openshift-os-release-4.17-presubmits.yaml @@ -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: