From 376d454c29f4159498ce63437a2be410fa31eeb2 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Tue, 19 Nov 2024 21:54:10 -0500
Subject: [PATCH] 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, promote this image as `node`. In the future, when we're
ready to switch CI over to the node image, it'll take the place of
`rhel-coreos`.
---
 .../config/openshift/os/openshift-os-master.yaml      | 11 +++++++++++
 core-services/image-mirroring/_config.yaml            |  4 ++++
 2 files changed, 15 insertions(+)

diff --git a/ci-operator/config/openshift/os/openshift-os-master.yaml b/ci-operator/config/openshift/os/openshift-os-master.yaml
index b5c138d4f43f7..f5339eb4532fa 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,6 +28,12 @@ images:
     WORKDIR /tmp/cosa
   from: root
   to: build-image
+- build_args:
+  - name: OPENSHIFT_CI
+    value: "1"
+  dockerfile_path: Containerfile
+  from: rhel-coreos-base
+  to: node
 promotion:
   to:
   - excluded_images:
diff --git a/core-services/image-mirroring/_config.yaml b/core-services/image-mirroring/_config.yaml
index 72324288ef0d1..81eabd185eafb 100644
--- a/core-services/image-mirroring/_config.yaml
+++ b/core-services/image-mirroring/_config.yaml
@@ -667,6 +667,10 @@ supplementalCIImages:
     image: quay.io/stackrox-io/apollo-ci:stackrox-ui-test-0.4.3
   stackrox/apollo-ci:stackrox-ui-test-0.4.4:
     image: quay.io/stackrox-io/apollo-ci:stackrox-ui-test-0.4.4
+  coreos/scos-base:9:
+    image: quay.io/openshift-release-dev/ocp-v4.0-art-dev:c9s-coreos
+  coreos/rhel-coreos-base:9.6:
+    image: quay.io/openshift-release-dev/ocp-v4.0-art-dev:rhel-9.6-coreos
   coreos/coreos-assembler:latest:
     image: quay.io/coreos-assembler/coreos-assembler:latest
   coreos/coreos-assembler:4.18: