From 24bfdf17c22be3241463586b69d0075c517e6b69 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Wed, 10 Mar 2021 00:29:51 +0000
Subject: [PATCH] openshift/os: Split building and testing

Requires: https://github.com/openshift/os/pull/513

Aiming to fix https://github.com/openshift/os/issues/506
---
 .../openshift/os/openshift-os-master.yaml     |  31 ++++-
 .../os/openshift-os-master-presubmits.yaml    | 106 +++++++++++++++++-
 2 files changed, 128 insertions(+), 9 deletions(-)

diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml
index 2babf778c1eb8..4546b02b9ba2c 100644
--- a/ci-operator/config/openshift/os/openshift-os-master.yaml
+++ b/ci-operator/config/openshift/os/openshift-os-master.yaml
@@ -1,11 +1,30 @@
-binary_build_commands: ./ci/build-test.sh
+base_images:
+  coreos_coreos-assembler_latest:
+    name: coreos-assembler
+    namespace: coreos
+    tag: latest
+  coreos_cosa-buildroot_latest:
+    name: cosa-buildroot
+    namespace: coreos
+    tag: latest
 build_root:
   image_stream_tag:
     name: cosa-buildroot
     namespace: coreos
     tag: latest
+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
 resources:
   '*':
+    requests:
+      cpu: 1000m
+      memory: 1Gi
+  build-test-qemu:
     limits:
       devices.kubevirt.io/kvm: "1"
     requests:
@@ -13,10 +32,14 @@ resources:
       devices.kubevirt.io/kvm: "1"
       memory: 2Gi
 tests:
-- as: unit
-  commands: "true"
+- as: validate
+  commands: ./ci/validate.sh
+  container:
+    from: src
+- as: build-test-qemu
+  commands: /src/ci/build-test-qemu.sh
   container:
-    from: bin
+    from: build-test-qemu-img
 zz_generated_metadata:
   branch: master
   org: openshift
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 c73999251445c..f2971ec641424 100644
--- a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml
@@ -5,7 +5,7 @@ presubmits:
     branches:
     - master
     cluster: build02
-    context: ci/prow/unit
+    context: ci/prow/build-test-qemu
     decorate: true
     decoration_config:
       skip_cloning: true
@@ -13,15 +13,15 @@ presubmits:
       ci-operator.openshift.io/prowgen-controlled: "true"
       devices.kubevirt.io/kvm: "1"
       pj-rehearse.openshift.io/can-be-rehearsed: "true"
-    name: pull-ci-openshift-os-master-unit
-    rerun_command: /test unit
+    name: pull-ci-openshift-os-master-build-test-qemu
+    rerun_command: /test build-test-qemu
     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=unit
+        - --target=build-test-qemu
         command:
         - ci-operator
         image: ci-operator:latest
@@ -48,4 +48,100 @@ presubmits:
       - name: result-aggregator
         secret:
           secretName: result-aggregator
-    trigger: (?m)^/test( | .* )unit,?($|\s.*)
+    trigger: (?m)^/test( | .* )build-test-qemu,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    cluster: build02
+    context: ci/prow/images
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-os-master-images
+    rerun_command: /test images
+    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=[images]
+        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( | .* )images,?($|\s.*)
+  - agent: kubernetes
+    always_run: true
+    branches:
+    - master
+    cluster: build02
+    context: ci/prow/validate
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/prowgen-controlled: "true"
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-os-master-validate
+    rerun_command: /test validate
+    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=validate
+        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( | .* )validate,?($|\s.*)