From 88932af523eba8b862b38a50f2a6bdeb9e0daff9 Mon Sep 17 00:00:00 2001
From: Zack Zlotnik <zzlotnik@redhat.com>
Date: Mon, 11 Jul 2022 14:34:13 -0400
Subject: [PATCH] build rhcos extensions image nightly

---
 .../os/openshift-os-master__periodic.yaml     | 26 ++++++++++++++++---
 .../os/openshift-os-master-periodics.yaml     | 13 +++++++---
 .../os/openshift-os-master-postsubmits.yaml   |  1 +
 .../os/openshift-os-master-presubmits.yaml    |  1 +
 4 files changed, 34 insertions(+), 7 deletions(-)

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 075968923532..e21a5c523c7e 100644
--- a/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml
+++ b/ci-operator/config/openshift/os/openshift-os-master__periodic.yaml
@@ -101,9 +101,16 @@ images:
       - destination_dir: magic
         source_path: /tmp/cosa
   to: machine-os-oci-content
+- dockerfile_path: extensions/Dockerfile
+  inputs:
+    machine-os-oci-content:
+      as:
+      - registry.ci.openshift.org/rhcos-devel/rhel-coreos:latest
+  to: rhcos-extensions-8.6
 promotion:
   additional_images:
     rhel-coreos: machine-os-oci-content
+    rhel-coreos-extensions: rhcos-extensions-8.6
   excluded_images:
   - '*'
   namespace: rhcos-devel
@@ -124,11 +131,22 @@ resources:
       cpu: 2000m
       memory: 4Gi
 tests:
-- as: validate-machine-os-oci-image
-  commands: cat /etc/os-release
-  container:
-    from: machine-os-oci-content
+- as: validate-built-images
   cron: '@daily'
+  steps:
+    test:
+    - as: validate-rhcos-base-image
+      commands: cat /etc/os-release
+      from: machine-os-oci-content
+      resources:
+        requests:
+          cpu: 100m
+    - as: validate-rhcos-extensions-image
+      commands: cat /etc/os-release
+      from: rhcos-extensions-8.6
+      resources:
+        requests:
+          cpu: 100m
 zz_generated_metadata:
   branch: master
   org: openshift
diff --git a/ci-operator/jobs/openshift/os/openshift-os-master-periodics.yaml b/ci-operator/jobs/openshift/os/openshift-os-master-periodics.yaml
index 5202a1358caa..0ee8882d2dff 100644
--- a/ci-operator/jobs/openshift/os/openshift-os-master-periodics.yaml
+++ b/ci-operator/jobs/openshift/os/openshift-os-master-periodics.yaml
@@ -1,7 +1,7 @@
 periodics:
 - agent: kubernetes
   cluster: build01
-  cron: 38 0 * * *
+  cron: 19 23 * * *
   decorate: true
   decoration_config:
     skip_cloning: true
@@ -13,14 +13,15 @@ periodics:
     ci-operator.openshift.io/variant: periodic
     ci.openshift.io/generator: prowgen
     pj-rehearse.openshift.io/can-be-rehearsed: "true"
-  name: periodic-ci-openshift-os-master-periodic-validate-machine-os-oci-image
+  name: periodic-ci-openshift-os-master-periodic-validate-built-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=validate-machine-os-oci-image
+      - --secret-dir=/secrets/ci-pull-credentials
+      - --target=validate-built-images
       - --variant=periodic
       command:
       - ci-operator
@@ -31,6 +32,9 @@ periodics:
         requests:
           cpu: 10m
       volumeMounts:
+      - mountPath: /secrets/ci-pull-credentials
+        name: ci-pull-credentials
+        readOnly: true
       - mountPath: /secrets/gcs
         name: gcs-credentials
         readOnly: true
@@ -42,6 +46,9 @@ periodics:
         readOnly: true
     serviceAccountName: ci-operator
     volumes:
+    - name: ci-pull-credentials
+      secret:
+        secretName: ci-pull-credentials
     - name: pull-secret
       secret:
         secretName: registry-pull-credentials
diff --git a/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml b/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml
index b0a50cac2ff0..7909ce441c3b 100644
--- a/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml
+++ b/ci-operator/jobs/openshift/os/openshift-os-master-postsubmits.yaml
@@ -78,6 +78,7 @@ postsubmits:
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
         - --target=machine-os-oci-content
+        - --target=rhcos-extensions-8.6
         - --variant=periodic
         command:
         - ci-operator
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 d3fc30820908..7806f8539028 100644
--- a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml
@@ -74,6 +74,7 @@ presubmits:
         - --report-credentials-file=/etc/report/credentials
         - --target=[images]
         - --target=machine-os-oci-content
+        - --target=rhcos-extensions-8.6
         - --variant=periodic
         command:
         - ci-operator