diff --git a/ci-operator/config/openshift/os/openshift-os-c9s.yaml b/ci-operator/config/openshift/os/openshift-os-c9s.yaml deleted file mode 100644 index 31b0405ab2477..0000000000000 --- a/ci-operator/config/openshift/os/openshift-os-c9s.yaml +++ /dev/null @@ -1,58 +0,0 @@ -base_images: - coreos_coreos-assembler_latest: - name: coreos-assembler - namespace: coreos - tag: latest -build_root: - image_stream_tag: - name: fcos-buildroot - namespace: coreos - tag: testing-devel -images: -- dockerfile_path: ci/Dockerfile - inputs: - coreos_coreos-assembler_latest: - as: - - registry.svc.ci.openshift.org/coreos/coreos-assembler:latest - to: build-test-qemu-img -promotion: - disabled: true - excluded_images: - - '*' - name: c9s - namespace: ocp -releases: - initial: - integration: - name: "4.9" - namespace: ocp - latest: - integration: - include_built_images: true - name: "4.9" - namespace: ocp -resources: - '*': - requests: - cpu: 1000m - memory: 1Gi - build-test-qemu: - limits: - devices.kubevirt.io/kvm: "1" - requests: - cpu: 1000m - devices.kubevirt.io/kvm: "1" - memory: 3Gi -tests: -- as: validate - commands: ./ci/validate.sh - container: - from: src -- as: build-test-qemu - commands: /src/ci/build-test-qemu.sh - container: - from: build-test-qemu-img -zz_generated_metadata: - branch: c9s - org: openshift - repo: os diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml index be3aa4bb93d97..03a10571e7ccf 100644 --- a/ci-operator/config/openshift/os/openshift-os-master.yaml +++ b/ci-operator/config/openshift/os/openshift-os-master.yaml @@ -60,6 +60,13 @@ resources: cpu: 1000m devices.kubevirt.io/kvm: "1" memory: 3Gi + build-test-qemu-scos: + limits: + devices.kubevirt.io/kvm: "1" + requests: + cpu: 1000m + devices.kubevirt.io/kvm: "1" + memory: 3Gi tests: - as: validate commands: ./ci/validate.sh @@ -139,6 +146,11 @@ tests: devices.kubevirt.io/kvm: "1" memory: 3Gi timeout: 3h0m0s +- as: build-test-qemu-scos + commands: /src/ci/build-test-qemu-scos.sh + container: + from: build-test-qemu-img + skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$ zz_generated_metadata: branch: master org: openshift