diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml index f4295435fa88f..49586dba92343 100644 --- a/ci-operator/config/openshift/os/openshift-os-master.yaml +++ b/ci-operator/config/openshift/os/openshift-os-master.yaml @@ -54,20 +54,6 @@ resources: requests: cpu: 100m memory: 200Mi - rhcos-86-build-test-metal: - limits: - devices.kubevirt.io/kvm: "1" - requests: - cpu: 2000m - devices.kubevirt.io/kvm: "1" - memory: 3Gi - rhcos-86-build-test-qemu: - limits: - devices.kubevirt.io/kvm: "1" - requests: - cpu: 2000m - devices.kubevirt.io/kvm: "1" - memory: 3Gi rhcos-90-build-test-metal: limits: devices.kubevirt.io/kvm: "1" @@ -102,20 +88,6 @@ tests: container: from: src skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ -- as: rhcos-86-build-test-qemu - cluster: build02 - commands: /src/ci/prow-entrypoint.sh rhcos-86-build-test-qemu - container: - from: build-image - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ - timeout: 3h0m0s -- as: rhcos-86-build-test-metal - cluster: build02 - commands: /src/ci/prow-entrypoint.sh rhcos-86-build-test-metal - container: - from: build-image - skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ - timeout: 3h0m0s - as: rhcos-90-build-test-qemu cluster: build02 commands: /src/ci/prow-entrypoint.sh rhcos-90-build-test-qemu diff --git a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml index 66bd1c71826e8..09fc709a9a440 100644 --- a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml @@ -51,112 +51,6 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )images,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build02 - context: ci/prow/rhcos-86-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-master-rhcos-86-build-test-metal - rerun_command: /test rhcos-86-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-86-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: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )rhcos-86-build-test-metal,?($|\s.*) - - agent: kubernetes - always_run: false - branches: - - ^master$ - - ^master- - cluster: build02 - context: ci/prow/rhcos-86-build-test-qemu - 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-master-rhcos-86-build-test-qemu - rerun_command: /test rhcos-86-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-86-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: /etc/pull-secret - name: pull-secret - readOnly: true - - mountPath: /etc/report - name: result-aggregator - readOnly: true - serviceAccountName: ci-operator - volumes: - - name: pull-secret - secret: - secretName: registry-pull-credentials - - name: result-aggregator - secret: - secretName: result-aggregator - trigger: (?m)^/test( | .* )rhcos-86-build-test-qemu,?($|\s.*) - agent: kubernetes always_run: false branches: