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

NO-JIRA: ci/prow: test on RHEL 9.6 #1703

Merged
merged 2 commits into from
Jan 23, 2025
Merged

NO-JIRA: ci/prow: test on RHEL 9.6 #1703

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
f1680ad
ci/prow: test on RHEL 9.6
jlebon Dec 19, 2024
0fcb0f7
ci/get-ocp-repo.sh: also download 9.4 repos for crun-wasm
jlebon Jan 23, 2025
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
8 changes: 8 additions & 0 deletions ci/get-ocp-repo.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ set -x
curl --fail -L "http://base-${ocp_version}-rhel${rhel_version}.ocp.svc.cluster.local" -o "$repo_path"
set +x

if [ "${rhel_version}" = 96 ]; then
# XXX: also currently also add 9.4 repos for crun-wasm when building extensions
# https://github.com/openshift/os/issues/1680
# https://github.com/openshift/os/pull/1682
# https://issues.redhat.com/browse/COS-3075
curl --fail -L http://base-4-19-rhel94.ocp.svc.cluster.local >> "$repo_path"
fi

# If we're building the SCOS OKD variant, then strip away all the RHEL repos and just keep the plashet.
# Temporary workaround until we have all packages for SCOS in CentOS Stream.
if [ "$osname" = scos ]; then
Expand Down
11 changes: 9 additions & 2 deletions ci/prow-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,7 @@ main() {
cosa_init "ocp-rhel-9.4"
cosa_build
;;
# this is called by cosa's CI
"rhcos-cosa-prow-pr-ci")
setup_user
cosa_init "ocp-rhel-9.4"
Expand All @@ -293,10 +294,16 @@ main() {
kola_test_metal
;;
"rhcos-96-build-test-qemu")
exit 0
setup_user
cosa_init "ocp-rhel-9.6"
cosa_build
kola_test_qemu
;;
"rhcos-96-build-test-metal")
exit 0
setup_user
cosa_init "ocp-rhel-9.6"
cosa_build
kola_test_metal
;;
"scos-9-build-test-qemu")
setup_user
Expand Down
4 changes: 3 additions & 1 deletion extensions-ocp-rhel-9.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ extensions:
- aarch64
repos:
- rhel-9.6-server-ose-4.19
# temporarily add rhel-9.4-appstream for crun-wasm
# XXX: temporarily add rhel-9.4-appstream for crun-wasm
# https://github.com/openshift/os/issues/1680
# https://issues.redhat.com/browse/COS-3075
# NOTE: when reverting this, also revert the associated hack in get-ocp-repo.sh
- rhel-9.4-appstream
packages:
- crun-wasm
Expand Down