Skip to content
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

Jump to bottom

COS-2608: Switch from c9s content to RHEL 9.4 beta content #1473

Merged
merged 2 commits into from
Apr 4, 2024
Merged

COS-2608: Switch from c9s content to RHEL 9.4 beta content #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98a956c
Switch from c9s content to RHEL 9.4 beta content
mike-nguyen Mar 26, 2024
2644efc
ci/prow-entrypoint.sh: update CI for 9.4
mike-nguyen Apr 3, 2024
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
11 changes: 3 additions & 8 deletions ci/prow-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,23 +74,18 @@ prepare_repos() {
rhelver=$(rpm-ostree compose tree --print-only "${manifest}" | jq -r '.["automatic-version-prefix"]' | cut -f2 -d.)

# Temporary workaround until we publish builds in the default path
if [[ "${rhelver}" == "92" ]]; then
prev_build_url="${REDIRECTOR_URL}/${ocpver}-9.2/builds/"
if [[ "${rhelver}" == "94" ]]; then
prev_build_url="${REDIRECTOR_URL}/${ocpver}-9.4/builds/"
# Fetch the previous build
cosa buildfetch --url="${prev_build_url}"
fi

# Fetch the repos corresponding to the release we are building
case "${rhelver}" in
92)
92|94)
curl --fail -L "http://base-${ocpver_mut}-rhel${rhelver}.ocp.svc.cluster.local" -o "src/config/ocp.repo"
cat src/config/ocp.repo
;;
94)
# For now, the 9.4 variant is mostly C9S, but we do still need some packages from 9.2 repos
curl --fail -L "http://base-${ocpver_mut}-rhel92.ocp.svc.cluster.local" -o "src/config/ocp.repo"
cat src/config/ocp.repo
;;
*)
# Assume C9S/SCOS if the version does not match known values for RHEL
# Temporary workaround until we have all packages for SCOS
Expand Down
6 changes: 3 additions & 3 deletions extensions-rhel-9.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ extensions:
- x86_64
- aarch64
repos:
- rhel-9.2-server-ose-4.16
- rhel-9.4-server-ose-4.16
packages:
- crun-wasm
# https://github.com/coreos/fedora-coreos-tracker/issues/1504
Expand Down Expand Up @@ -52,7 +52,7 @@ extensions:
architectures:
- x86_64
repos:
- nfv
- rhel-9.4-nfv
packages:
- kernel-rt-core
- kernel-rt-kvm
Expand All @@ -69,7 +69,7 @@ extensions:
- x86_64
- s390x
repos:
- rhel-9.2-server-ose-4.16
- rhel-9.4-server-ose-4.16
packages:
- kata-containers
# https://issues.redhat.com/browse/COS-2402
Expand Down
26 changes: 9 additions & 17 deletions manifest-rhel-9.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,12 @@ include:

# Starting from here, everything should be specific to RHCOS based on RHEL 9.4 content

# CentOS Stream 9 repos + internal repos for now
repos:
- baseos
- appstream
- rhel-9.2-fast-datapath
- rhel-9.4-baseos
- rhel-9.4-appstream
- rhel-9.4-fast-datapath
# Include RHCOS 9 repo for oc, kubelet
- rhel-9.2-server-ose-4.16
- rhel-9.4-server-ose-4.16

# We include hours/minutes to avoid version number reuse
automatic-version-prefix: "416.94.<date:%Y%m%d%H%M>"
Expand Down Expand Up @@ -113,22 +112,15 @@ postprocess:
# constraints that do not apply to SCOS
packages:
# We include the generic release package and tweak the os-release info in a
# post-proces script
- centos-release
# Below this are temporary overrides to not get too new content before we retarget RHEL content proper
# https://issues.redhat.com/browse/RHEL-29856
- NetworkManager-1.46.0-1.el9
# post-process script
- redhat-release

# Packages pinned to specific repos in SCOS 9
# Packages pinned to specific repos in RHCOS 9
repo-packages:
# We always want the kernel from BaseOS
- repo: baseos
packages:
- kernel
Comment on lines -125 to -127
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any specific reason for removing this part?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't have it in https://github.com/openshift/os/blob/master/manifest-rhel-9.2.yaml and only in C9S and if I remember correctly we sometimes takes kernel in advance of RHEL.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this should be good.

- repo: appstream
- repo: rhel-9.4-appstream
packages:
- nss-altfiles
- repo: rhel-9.2-server-ose-4.16
- repo: rhel-9.4-server-ose-4.16
packages:
- conmon-rs
- cri-o
Expand Down