Skip to content

Commit d274f57

Browse files
committed
ci-operator/kubernetes: output RHCOS overlay to both rhel-coreos and rhel-coreos-10
Signed-off-by: jubittajohn <jujohn@redhat.com>
1 parent 55615d9 commit d274f57

1 file changed

Lines changed: 16 additions & 0 deletions

File tree

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,20 @@ images:
8585
as:
8686
- registry.ci.openshift.org/rhcos-devel/rhel-coreos-10
8787
to: rhel-coreos-10
88+
- dockerfile_literal: |
89+
FROM quay.io/centos/centos:stream10 as build
90+
RUN ls -al /etc/yum.repos.d && dnf -y install dnf-utils && dnf --disablerepo='*' --enablerepo=built download openshift-\*
91+
FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos-10
92+
COPY --from=build /*.rpm /
93+
RUN rpm -Uvh --oldpackage /*.rpm && rm -vf /*.rpm /usr/share/rpm/__db.* /usr/share/rpm/.*.lock
94+
inputs:
95+
base-machine-with-rpms:
96+
as:
97+
- quay.io/centos/centos:stream10
98+
rhel-coreos-base:
99+
as:
100+
- registry.ci.openshift.org/rhcos-devel/rhel-coreos-10
101+
to: rhel-coreos
88102
- context_dir: build/pause
89103
dockerfile_path: Dockerfile.Rhel
90104
to: pod
@@ -96,12 +110,14 @@ promotion:
96110
artifacts: artifacts
97111
excluded_images:
98112
- rhel-coreos-10
113+
- rhel-coreos
99114
name: "5.0"
100115
namespace: ocp
101116
- additional_images:
102117
artifacts: artifacts
103118
excluded_images:
104119
- rhel-coreos-10
120+
- rhel-coreos
105121
- hyperkube
106122
- kube-proxy
107123
- kubernetes-tests

0 commit comments

Comments
 (0)