diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml index 53cfd36ab0cba..ab61ffe6429c6 100644 --- a/ci-operator/config/openshift/os/openshift-os-master.yaml +++ b/ci-operator/config/openshift/os/openshift-os-master.yaml @@ -78,7 +78,7 @@ tests: steps: test: - as: test - commands: /src/ci/prow-entrypoint.sh build-test-qemu-kola-basic + commands: /src/ci/prow-entrypoint.sh rhcos-86-build-test-qemu from: build-image resources: limits: @@ -93,7 +93,7 @@ tests: steps: test: - as: test - commands: /src/ci/prow-entrypoint.sh build-test-qemu-kola-all + commands: /src/ci/prow-entrypoint.sh rhcos-86-build-test-metal from: build-image resources: limits: @@ -108,7 +108,7 @@ tests: steps: test: - as: test - commands: /src/ci/prow-entrypoint.sh build-test-qemu-kola-upgrade + commands: /src/ci/prow-entrypoint.sh rhcos-90-build-test-qemu from: build-image resources: limits: @@ -123,7 +123,37 @@ tests: steps: test: - as: test - commands: /src/ci/prow-entrypoint.sh build-test-qemu-kola-metal + commands: /src/ci/prow-entrypoint.sh rhcos-90-build-test-metal + from: build-image + resources: + limits: + devices.kubevirt.io/kvm: "1" + requests: + cpu: 2000m + devices.kubevirt.io/kvm: "1" + memory: 3Gi +- as: scos-9-build-test-qemu + cluster: build02 + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + steps: + test: + - as: test + commands: /src/ci/prow-entrypoint.sh scos-9-build-test-qemu + from: build-image + resources: + limits: + devices.kubevirt.io/kvm: "1" + requests: + cpu: 2000m + devices.kubevirt.io/kvm: "1" + memory: 3Gi +- as: scos-9-build-test-metal + cluster: build02 + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ + steps: + test: + - as: test + commands: /src/ci/prow-entrypoint.sh scos-9-build-test-metal from: build-image resources: limits: 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 65d983859b66f..83f66a23262ef 100644 --- a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml +++ b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml @@ -282,6 +282,122 @@ presubmits: secret: secretName: result-aggregator trigger: (?m)^/test( | .* )rhcos-90-build-test-qemu,?($|\s.*) + - agent: kubernetes + always_run: false + branches: + - ^master$ + - ^master- + cluster: build02 + context: ci/prow/scos-9-build-test-metal + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-os-master-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 + - --secret-dir=/secrets/ci-pull-credentials + - --target=scos-9-build-test-metal + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - 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: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - 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: + - ^master$ + - ^master- + cluster: build02 + context: ci/prow/scos-9-build-test-qemu + decorate: true + decoration_config: + skip_cloning: true + labels: + ci-operator.openshift.io/cluster: build02 + ci.openshift.io/generator: prowgen + pj-rehearse.openshift.io/can-be-rehearsed: "true" + name: pull-ci-openshift-os-master-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 + - --secret-dir=/secrets/ci-pull-credentials + - --target=scos-9-build-test-qemu + command: + - ci-operator + image: ci-operator:latest + imagePullPolicy: Always + name: "" + resources: + requests: + cpu: 10m + volumeMounts: + - mountPath: /secrets/ci-pull-credentials + name: ci-pull-credentials + readOnly: true + - 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: ci-pull-credentials + secret: + secretName: ci-pull-credentials + - 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: