From 9855ff425d0522f4cb426b429fe2baf4149881fa Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Thu, 19 Dec 2024 17:07:54 -0500
Subject: [PATCH] openshift/os: start building node image (#59490)

* openshift/os: start building node image

As part of https://github.com/openshift/enhancements/pull/1637, we want
to start building the node image as a layered build on top of an RHCOS
base image.

For now, don't promote this image. In the future, when we're ready to
switch CI over, it'll take the place of `rhel-coreos`.

* openshift/os: add an e2e-aws test

Now that we're building the node image in CI, we can run cluster tests
with it. Let's start simple for now with just the standard e2e-aws test.
Note that it doesn't run by default. This means that we can request it
on specific PRs only using `/test`.
---
 .../openshift/os/openshift-os-master.yaml     | 19 +++++
 .../os/openshift-os-master-presubmits.yaml    | 76 +++++++++++++++++++
 2 files changed, 95 insertions(+)

diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml
index b5c138d4f43f..249d472a6d66 100644
--- a/ci-operator/config/openshift/os/openshift-os-master.yaml
+++ b/ci-operator/config/openshift/os/openshift-os-master.yaml
@@ -1,3 +1,8 @@
+base_images:
+  rhel-coreos-base:
+    name: rhel-coreos-base
+    namespace: coreos
+    tag: "9.6"
 build_root:
   image_stream_tag:
     name: coreos-assembler
@@ -23,10 +28,17 @@ images:
     WORKDIR /tmp/cosa
   from: root
   to: build-image
+- build_args:
+  - name: OPENSHIFT_CI
+    value: "1"
+  dockerfile_path: Containerfile
+  from: rhel-coreos-base
+  to: rhel-coreos
 promotion:
   to:
   - excluded_images:
     - build-image
+    - rhel-coreos
     name: "4.19"
     namespace: ocp
 releases:
@@ -154,6 +166,13 @@ tests:
     from: build-image
   skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
   timeout: 3h0m0s
+- always_run: false
+  as: e2e-aws
+  optional: true
+  skip_if_only_changed: ^docs/|\.md$|^(?:.*/)?(?:\.gitignore|OWNERS|PROJECT|LICENSE)$
+  steps:
+    cluster_profile: aws
+    workflow: openshift-e2e-aws
 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 842e61c00b66..68ad39e0baaa 100644
--- a/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml
+++ b/ci-operator/jobs/openshift/os/openshift-os-master-presubmits.yaml
@@ -1,5 +1,81 @@
 presubmits:
   openshift/os:
+  - agent: kubernetes
+    always_run: false
+    branches:
+    - ^master$
+    - ^master-
+    cluster: build10
+    context: ci/prow/e2e-aws
+    decorate: true
+    decoration_config:
+      skip_cloning: true
+    labels:
+      ci-operator.openshift.io/cloud: aws
+      ci-operator.openshift.io/cloud-cluster-profile: aws
+      ci.openshift.io/generator: prowgen
+      pj-rehearse.openshift.io/can-be-rehearsed: "true"
+    name: pull-ci-openshift-os-master-e2e-aws
+    optional: true
+    rerun_command: /test e2e-aws
+    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
+        - --lease-server-credentials-file=/etc/boskos/credentials
+        - --report-credentials-file=/etc/report/credentials
+        - --secret-dir=/secrets/ci-pull-credentials
+        - --target=e2e-aws
+        command:
+        - ci-operator
+        image: ci-operator:latest
+        imagePullPolicy: Always
+        name: ""
+        resources:
+          requests:
+            cpu: 10m
+        volumeMounts:
+        - mountPath: /etc/boskos
+          name: boskos
+          readOnly: true
+        - mountPath: /secrets/ci-pull-credentials
+          name: ci-pull-credentials
+          readOnly: true
+        - mountPath: /secrets/gcs
+          name: gcs-credentials
+          readOnly: true
+        - mountPath: /secrets/manifest-tool
+          name: manifest-tool-local-pusher
+          readOnly: true
+        - mountPath: /etc/pull-secret
+          name: pull-secret
+          readOnly: true
+        - mountPath: /etc/report
+          name: result-aggregator
+          readOnly: true
+      serviceAccountName: ci-operator
+      volumes:
+      - name: boskos
+        secret:
+          items:
+          - key: credentials
+            path: credentials
+          secretName: boskos-credentials
+      - name: ci-pull-credentials
+        secret:
+          secretName: ci-pull-credentials
+      - name: manifest-tool-local-pusher
+        secret:
+          secretName: manifest-tool-local-pusher
+      - name: pull-secret
+        secret:
+          secretName: registry-pull-credentials
+      - name: result-aggregator
+        secret:
+          secretName: result-aggregator
+    trigger: (?m)^/test( | .* )e2e-aws,?($|\s.*)
   - agent: kubernetes
     always_run: false
     branches: