Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ci/prow-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ cosa_build() {
# Temporary workaround until we have all packages for RHCOS 9
curl -L "http://base-${ocpver_mut}-rhel86.ocp.svc.cluster.local" -o "src/config/tmp.repo"
awk '/rhel-8-server-ose/,/^$/' "src/config/tmp.repo" > "src/config/ocp86.repo"
echo "includepkgs=kata-containers,skopeo" >> "src/config/ocp86.repo"
echo "includepkgs=skopeo" >> "src/config/ocp86.repo"
rm "src/config/tmp.repo"
else
# Assume C9S/SCOS if the version does not match known values for RHEL
Expand Down
15 changes: 8 additions & 7 deletions extensions-c9s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

repos:
- nfv
- sig-virtualization

extensions:
# https://github.com/coreos/fedora-coreos-tracker/issues/326
Expand Down Expand Up @@ -50,10 +51,10 @@ extensions:
# https://github.com/openshift/enhancements/blob/master/enhancements/sandboxed-containers/sandboxed-containers-tech-preview.md
# GRPA-3123
# - kata-containers
# sandboxed-containers:
# architectures:
# - x86_64
# repos:
# - appstream
# packages:
# - kata-containers
sandboxed-containers:
architectures:
- x86_64
repos:
- sig-virtualization
packages:
- kata-containers
2 changes: 0 additions & 2 deletions extensions-rhel-9.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@

repos:
- rhel-9-nfv
# Temporarily included for kata-containers
- rhel-8-server-ose

extensions:
# https://github.com/coreos/fedora-coreos-tracker/issues/326
Expand Down
1 change: 1 addition & 0 deletions kola-denylist-c9s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@

# Broken tests under investigation
- pattern: coreos.boot-mirror
- pattern: crio.base
- pattern: ext.config.shared.chrony.dhcp-propagation
- pattern: ext.config.shared.files.dracut-executable
tracker: https://github.com/openshift/os/issues/942
Expand Down
8 changes: 8 additions & 0 deletions repos/c9s.repo
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,11 @@ gpgcheck=1
repo_gpgcheck=0
enabled=1
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-NFV

[sig-virtualization]
name=CentOS Stream 9 - SIG Virtualization
baseurl=http://mirror.stream.centos.org/SIGs/9-stream/virt/x86_64/kata-containers/
gpgcheck=1
repo_gpgcheck=0
enabled=1
gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Virtualization