From 2ce3fcbae705dcf38893290938ffca2ee802a662 Mon Sep 17 00:00:00 2001
From: jubittajohn <jujohn@redhat.com>
Date: Mon, 29 Jun 2026 16:24:28 -0400
Subject: [PATCH] ci-operator/kubernetes: output RHCOS overlay to both
 rhel-coreos and rhel-coreos-10

Signed-off-by: jubittajohn <jujohn@redhat.com>
---
 .../openshift-kubernetes-master.yaml          | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
index 8ecdba724e68c..c8bc655c593a1 100644
--- a/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
+++ b/ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
@@ -7,6 +7,10 @@ base_images:
     name: centos
     namespace: openshift
     tag: stream10
+  base-machine-rhel9:
+    name: centos
+    namespace: openshift
+    tag: stream9
   cli:
     name: "5.0"
     namespace: ocp
@@ -43,6 +47,10 @@ base_images:
     name: "5.0"
     namespace: ocp
     tag: rhel-coreos-10
+  rhel-coreos-base-rhel9:
+    name: "5.0"
+    namespace: ocp
+    tag: rhel-coreos
   tools:
     name: "5.0"
     namespace: ocp
@@ -85,6 +93,20 @@ images:
         as:
         - registry.ci.openshift.org/rhcos-devel/rhel-coreos-10
     to: rhel-coreos-10
+  - dockerfile_literal: |
+      FROM quay.io/centos/centos:stream9 as build
+      RUN ls -al /etc/yum.repos.d && dnf -y install dnf-utils && dnf --disablerepo='*' --enablerepo=built download openshift-\*
+      FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos
+      COPY --from=build /*.rpm /
+      RUN rpm -Uvh --oldpackage /*.rpm && rm -vf /*.rpm /usr/share/rpm/__db.* /usr/share/rpm/.*.lock
+    inputs:
+      base-machine-rhel9-with-rpms:
+        as:
+        - quay.io/centos/centos:stream9
+      rhel-coreos-base-rhel9:
+        as:
+        - registry.ci.openshift.org/rhcos-devel/rhel-coreos
+    to: rhel-coreos
   - context_dir: build/pause
     dockerfile_path: Dockerfile.Rhel
     to: pod
@@ -96,12 +118,14 @@ promotion:
       artifacts: artifacts
     excluded_images:
     - rhel-coreos-10
+    - rhel-coreos
     name: "5.0"
     namespace: ocp
   - additional_images:
       artifacts: artifacts
     excluded_images:
     - rhel-coreos-10
+    - rhel-coreos
     - hyperkube
     - kube-proxy
     - kubernetes-tests
@@ -155,6 +179,9 @@ raw_steps:
 - rpm_image_injection_step:
     from: base-machine
     to: base-machine-with-rpms
+- rpm_image_injection_step:
+    from: base-machine-rhel9
+    to: base-machine-rhel9-with-rpms
 releases:
   initial:
     integration: