Skip to content

Commit b337188

Browse files
authored
ci-operator/kubernetes: output RHCOS overlay to both rhel-coreos and rhel-coreos-10 (#81240)
Signed-off-by: jubittajohn <jujohn@redhat.com>
1 parent 2246d19 commit b337188

1 file changed

Lines changed: 27 additions & 0 deletions

File tree

ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ base_images:
77
name: centos
88
namespace: openshift
99
tag: stream10
10+
base-machine-rhel9:
11+
name: centos
12+
namespace: openshift
13+
tag: stream9
1014
cli:
1115
name: "5.0"
1216
namespace: ocp
@@ -43,6 +47,10 @@ base_images:
4347
name: "5.0"
4448
namespace: ocp
4549
tag: rhel-coreos-10
50+
rhel-coreos-base-rhel9:
51+
name: "5.0"
52+
namespace: ocp
53+
tag: rhel-coreos
4654
tools:
4755
name: "5.0"
4856
namespace: ocp
@@ -85,6 +93,20 @@ images:
8593
as:
8694
- registry.ci.openshift.org/rhcos-devel/rhel-coreos-10
8795
to: rhel-coreos-10
96+
- dockerfile_literal: |
97+
FROM quay.io/centos/centos:stream9 as build
98+
RUN ls -al /etc/yum.repos.d && dnf -y install dnf-utils && dnf --disablerepo='*' --enablerepo=built download openshift-\*
99+
FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos
100+
COPY --from=build /*.rpm /
101+
RUN rpm -Uvh --oldpackage /*.rpm && rm -vf /*.rpm /usr/share/rpm/__db.* /usr/share/rpm/.*.lock
102+
inputs:
103+
base-machine-rhel9-with-rpms:
104+
as:
105+
- quay.io/centos/centos:stream9
106+
rhel-coreos-base-rhel9:
107+
as:
108+
- registry.ci.openshift.org/rhcos-devel/rhel-coreos
109+
to: rhel-coreos
88110
- context_dir: build/pause
89111
dockerfile_path: Dockerfile.Rhel
90112
to: pod
@@ -96,12 +118,14 @@ promotion:
96118
artifacts: artifacts
97119
excluded_images:
98120
- rhel-coreos-10
121+
- rhel-coreos
99122
name: "5.0"
100123
namespace: ocp
101124
- additional_images:
102125
artifacts: artifacts
103126
excluded_images:
104127
- rhel-coreos-10
128+
- rhel-coreos
105129
- hyperkube
106130
- kube-proxy
107131
- kubernetes-tests
@@ -155,6 +179,9 @@ raw_steps:
155179
- rpm_image_injection_step:
156180
from: base-machine
157181
to: base-machine-with-rpms
182+
- rpm_image_injection_step:
183+
from: base-machine-rhel9
184+
to: base-machine-rhel9-with-rpms
158185
releases:
159186
initial:
160187
integration:

0 commit comments

Comments
 (0)