Skip to content

OCPBUGS-52293: extensions: make rhel-9.4-appstream global #1784

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
Apr 4, 2025
Merged

OCPBUGS-52293: extensions: make rhel-9.4-appstream global #1784

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
21 changes: 13 additions & 8 deletions extensions-ocp-rhel-9.6.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,24 @@
# https://github.com/openshift/enhancements/blob/master/enhancements/rhcos/extensions.md
# and https://github.com/coreos/fedora-coreos-tracker/issues/401

# RULE: Do not add repos to specific extensions below if the extension is not
# multi-arch, but the repos are. Instead, put them in the global repos list at
# the top. Otherwise, we can have consistency issues across arches. See e.g.
# https://issues.redhat.com/browse/OCPBUGS-52293.

repos:
# XXX: temporarily add rhel-9.4-appstream for crun-wasm
# https://github.com/openshift/os/issues/1680
# https://issues.redhat.com/browse/COS-3075
# For wasm extension, but placed here to respect the RULE above.
- rhel-9.4-appstream

extensions:
# https://issues.redhat.com/browse/RFE-4177
wasm:
architectures:
- x86_64
- aarch64
repos:
- rhel-9.6-server-ose-4.19
# XXX: temporarily add rhel-9.4-appstream for crun-wasm
# https://github.com/openshift/os/issues/1680
# https://issues.redhat.com/browse/COS-3075
- rhel-9.4-appstream
packages:
- crun-wasm
# https://github.com/coreos/fedora-coreos-tracker/issues/1504
Expand Down Expand Up @@ -59,6 +65,7 @@ extensions:
architectures:
- x86_64
repos:
# this is only available for x86_64, so keep here
- rhel-9.6-nfv
packages:
- kernel-rt-core
Expand All @@ -75,8 +82,6 @@ extensions:
architectures:
- x86_64
- s390x
repos:
- rhel-9.6-server-ose-4.19
packages:
- kata-containers
# https://issues.redhat.com/browse/COS-2402
Expand Down
5 changes: 5 additions & 0 deletions extensions-okd-c9s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
# https://github.com/openshift/enhancements/blob/master/enhancements/rhcos/extensions.md
# and https://github.com/coreos/fedora-coreos-tracker/issues/401

# RULE: Do not add repos to specific extensions below if the extension is not
# multi-arch, but the repos are. Instead, put them in the global repos list at
# the top. Otherwise, we can have consistency issues across arches. See e.g.
# https://issues.redhat.com/browse/OCPBUGS-52293.

repos:
- c9s-sig-virtualization
# Some of the extensions here have version bindings to host packages. Add the
Expand Down