Skip to content

Commit

Permalink
ci/get-ocp-repo.sh: also download 9.4 repos for crun-wasm
Browse files Browse the repository at this point in the history
Right now `get-ocp-repo.sh` only downloads repos for a single RHEL
version. This breaks the extension build for 9.6 where we currently need
to also include the 4.19 9.4 plashet for crun-wasm, which hasn't been
rebuilt yet for 9.6.

See also: https://issues.redhat.com/browse/COS-3075
  • Loading branch information
jlebon committed Jan 23, 2025
1 parent f1680ad commit 0fcb0f7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
8 changes: 8 additions & 0 deletions ci/get-ocp-repo.sh
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
4 changes: 3 additions & 1 deletion extensions-ocp-rhel-9.6.yaml
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

0 comments on commit 0fcb0f7

Please sign in to comment.