From 05a62d31ffd858071bcfbcb7682331c9c350745a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Wed, 3 Aug 2022 18:02:21 +0200
Subject: [PATCH 1/2] extensions-el9: kata-containers is now available

---
 ci/prow-entrypoint.sh    |  2 +-
 extensions-c9s.yaml      | 15 ++++++++-------
 extensions-rhel-9.0.yaml |  2 --
 repos/c9s.repo           |  8 ++++++++
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ci/prow-entrypoint.sh b/ci/prow-entrypoint.sh
index 6726272a8..004f81589 100755
--- a/ci/prow-entrypoint.sh
+++ b/ci/prow-entrypoint.sh
@@ -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
diff --git a/extensions-c9s.yaml b/extensions-c9s.yaml
index 93e66bd56..c953696ec 100644
--- a/extensions-c9s.yaml
+++ b/extensions-c9s.yaml
@@ -4,6 +4,7 @@
 
 repos:
   - nfv
+  - sig-virtualization
 
 extensions:
   # https://github.com/coreos/fedora-coreos-tracker/issues/326
@@ -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
diff --git a/extensions-rhel-9.0.yaml b/extensions-rhel-9.0.yaml
index 24d8c1cd1..78bde7ddf 100644
--- a/extensions-rhel-9.0.yaml
+++ b/extensions-rhel-9.0.yaml
@@ -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
diff --git a/repos/c9s.repo b/repos/c9s.repo
index 00c03cf28..b5f8e3bb7 100644
--- a/repos/c9s.repo
+++ b/repos/c9s.repo
@@ -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

From 6830e5c6675119c2c6a54fdca31218a2414e0ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Fri, 26 Aug 2022 12:09:37 +0200
Subject: [PATCH 2/2] c9s: Skip crio.base test for now

---
 kola-denylist-c9s.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kola-denylist-c9s.yaml b/kola-denylist-c9s.yaml
index e10e71d76..087a3a456 100644
--- a/kola-denylist-c9s.yaml
+++ b/kola-denylist-c9s.yaml
@@ -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