From ad8c3a2010a71ea1eaf436423e47284ca1810f91 Mon Sep 17 00:00:00 2001
From: Zack Zlotnik <zzlotnik@redhat.com>
Date: Mon, 6 Jun 2022 14:42:14 -0400
Subject: [PATCH] run cosa build in the test stages to take advantage of KVM

---
 .../config/openshift/os/openshift-os-master.yaml  | 15 ++++++++++-----
 .../os/openshift-os-master__periodic.yaml         | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml
index c14682f6a06d8..edf00e029841c 100644
--- a/ci-operator/config/openshift/os/openshift-os-master.yaml
+++ b/ci-operator/config/openshift/os/openshift-os-master.yaml
@@ -162,8 +162,9 @@ tests:
         #!/bin/bash
         set -xeuo
         /src/ci/set-openshift-user.sh
+        /src/ci/prow-build.sh
         cosa kola run --qemu-nvme=true basic
-      from: cosa-build
+      from: build-test-qemu-img
       resources:
         limits:
           devices.kubevirt.io/kvm: "1"
@@ -182,8 +183,9 @@ tests:
         #!/bin/bash
         set -xeuo
         /src/ci/set-openshift-user.sh
+        /src/ci/prow-build.sh
         cosa kola run --qemu-firmware=uefi basic
-      from: cosa-build
+      from: build-test-qemu-img
       resources:
         limits:
           devices.kubevirt.io/kvm: "1"
@@ -202,8 +204,9 @@ tests:
         #!/bin/bash
         set -xeuo
         /src/ci/set-openshift-user.sh
+        /src/ci/prow-build.sh
         kola run-upgrade -b rhcos -v --find-parent-image --qemu-image-dir tmp/ --output-dir tmp/kola-upgrade
-      from: cosa-build
+      from: build-test-qemu-img
       resources:
         limits:
           devices.kubevirt.io/kvm: "1"
@@ -222,8 +225,9 @@ tests:
         #!/bin/bash
         set -xeuo
         /src/ci/set-openshift-user.sh
+        /src/ci/prow-build.sh
         cosa kola run --parallel 2
-      from: cosa-build
+      from: build-test-qemu-img
       resources:
         limits:
           devices.kubevirt.io/kvm: "1"
@@ -242,10 +246,11 @@ tests:
         #!/bin/bash
         set -xeuo
         /src/ci/set-openshift-user.sh
+        /src/ci/prow-build.sh
         cosa buildextend-metal && cosa buildextend-metal4k && cosa buildextend-live
         cosa compress --artifact=metal --artifact=metal4k
         kola testiso -S --scenarios pxe-install,pxe-offline-install --output-dir tmp/kola-metal
-      from: cosa-build
+      from: build-test-qemu-img
       resources:
         limits:
           devices.kubevirt.io/kvm: "1"
diff --git a/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml b/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml
index aecbeda3ec57d..d2c999e89e3c1 100644
--- a/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml
+++ b/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml
@@ -163,8 +163,9 @@ tests:
         #!/bin/bash
         set -xeuo
         /src/ci/set-openshift-user.sh
+        /src/ci/prow-build.sh
         cosa kola run --qemu-nvme=true basic
-      from: cosa-build
+      from: build-test-qemu-img
       resources:
         limits:
           devices.kubevirt.io/kvm: "1"
@@ -183,8 +184,9 @@ tests:
         #!/bin/bash
         set -xeuo
         /src/ci/set-openshift-user.sh
+        /src/ci/prow-build.sh
         cosa kola run --qemu-firmware=uefi basic
-      from: cosa-build
+      from: build-test-qemu-img
       resources:
         limits:
           devices.kubevirt.io/kvm: "1"
@@ -203,8 +205,9 @@ tests:
         #!/bin/bash
         set -xeuo
         /src/ci/set-openshift-user.sh
+        /src/ci/prow-build.sh
         kola run-upgrade -b rhcos -v --find-parent-image --qemu-image-dir tmp/ --output-dir tmp/kola-upgrade
-      from: cosa-build
+      from: build-test-qemu-img
       resources:
         limits:
           devices.kubevirt.io/kvm: "1"
@@ -223,8 +226,9 @@ tests:
         #!/bin/bash
         set -xeuo
         /src/ci/set-openshift-user.sh
+        /src/ci/prow-build.sh
         cosa kola run --parallel 2
-      from: cosa-build
+      from: build-test-qemu-img
       resources:
         limits:
           devices.kubevirt.io/kvm: "1"
@@ -243,10 +247,11 @@ tests:
         #!/bin/bash
         set -xeuo
         /src/ci/set-openshift-user.sh
+        /src/ci/prow-build.sh
         cosa buildextend-metal && cosa buildextend-metal4k && cosa buildextend-live
         cosa compress --artifact=metal --artifact=metal4k
         kola testiso -S --scenarios pxe-install,pxe-offline-install --output-dir tmp/kola-metal
-      from: cosa-build
+      from: build-test-qemu-img
       resources:
         limits:
           devices.kubevirt.io/kvm: "1"