Skip to content

ci-operator/config: document RHCOS layering trick a bit more #47609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Mar 7, 2024
Merged

ci-operator/config: document RHCOS layering trick a bit more #47609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions ci-operator/config/cri-o/cri-o/cri-o-cri-o-main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,14 @@ build_root:
tag: golang-1.21
images:
- dockerfile_literal: |
# This uses the new rhel-coreos-9 base image
# https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
# We want to test the PR using the code from it. Now, this repo ships RPMs
# which are normally part of RHCOS. We need to make sure that RHCOS itself
# is updated with the freshly built RPMs from the PR run. To do this, we do a
# multi-stage build: the first stage downloads the RPMs that were just built
# (the `base-machine-with-rpms` contains the RPMs), and the second stage
# installs the RPMs into RHCOS (this uses the fact that RHCOS is now a native
# bootable container).
# See also: https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
FROM quay.io/centos/centos:stream9 as build
# Sadly rpm-ostree in rhel8 right now doesn't support e.g. `rpm-ostree upgrade openshift-hyperkube`
# in a container https://github.com/coreos/rpm-ostree/issues/4034
Expand Down
10 changes: 8 additions & 2 deletions ci-operator/config/openshift/kubernetes/openshift-kubernetes-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,14 @@ images:
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
to: machine-os-content
- dockerfile_literal: |
# This uses the new rhel-coreos base image
# https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
# We want to test the PR using the code from it. Now, this repo ships RPMs
# which are normally part of RHCOS. We need to make sure that RHCOS itself
# is updated with the freshly built RPMs from the PR run. To do this, we do a
# multi-stage build: the first stage downloads the RPMs that were just built
# (the `base-machine-with-rpms` contains the RPMs), and the second stage
# installs the RPMs into RHCOS (this uses the fact that RHCOS is now a native
# bootable container).
# See also: https://github.com/openshift/enhancements/blob/master/enhancements/ocp-coreos-layering/ocp-coreos-layering.md
FROM quay.io/centos/centos:stream9 as build
# Sadly rpm-ostree in rhel8 right now doesn't support e.g. `rpm-ostree upgrade openshift-hyperkube`
# in a container https://github.com/coreos/rpm-ostree/issues/4034
Expand Down