Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ci-operator/config/cri-o/cri-o/cri-o-cri-o-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ base_images:
name: centos
namespace: openshift
tag: stream9
rhel-coreos-9-base:
rhel-coreos-base:
name: "4.18"
namespace: ocp
tag: rhel-coreos-9
tag: rhel-coreos
build_root:
image_stream_tag:
name: release
Expand All @@ -27,18 +27,18 @@ images:
# in a container https://github.com/coreos/rpm-ostree/issues/4034
RUN ls -al /etc/yum.repos.d && dnf -y install dnf-utils && dnf --disablerepo='*' --enablerepo=built download cri-o
# See also https://issues.redhat.com/browse/ART-4352
FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos-9
FROM registry.ci.openshift.org/rhcos-devel/rhel-coreos
COPY --from=build /*.rpm /
# Also delete leftover RPM files; see https://issues.redhat.com/browse/OCPBUGS-6505.
RUN rpm -Uvh --oldpackage /*.rpm && rm -vf /*.rpm /usr/share/rpm/__db.* /usr/share/rpm/.*.lock
inputs:
base-machine-with-rpms:
as:
- quay.io/centos/centos:stream9
rhel-coreos-9-base:
rhel-coreos-base:
as:
- registry.ci.openshift.org/rhcos-devel/rhel-coreos-9
to: rhel-coreos-9
- registry.ci.openshift.org/rhcos-devel/rhel-coreos
to: rhel-coreos
raw_steps:
- rpm_image_injection_step:
from: base-machine
Expand Down