From f269c7b6d1d49cf463790d5462e4cb04efc3f6b4 Mon Sep 17 00:00:00 2001
From: Michael Nguyen <mnguyen@redhat.com>
Date: Fri, 6 May 2022 15:04:49 -0400
Subject: [PATCH 1/2] [rhel8.5 revert] Use RHEL8.6 repo for kata-containers

Reverting back to RHEL 8.5 content caused extension building to fail
because the newer kata-container has a requirement on a qemu-kvm-core
version that is newer than the one in the rhel-8-advanced-virt repo.

Get the kata-containers dependencies from RHEL8.6 appstream.

See: https://github.com/openshift/os/issues/795
---
 extensions.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extensions.yaml b/extensions.yaml
index d989e3b06..1f0d8b805 100644
--- a/extensions.yaml
+++ b/extensions.yaml
@@ -57,6 +57,6 @@ extensions:
       enable:
         - virt:rhel
     repos:
-      - rhel-8-appstream
+      - rhel-86-appstream
     packages:
       - kata-containers

From 68ec9f32285c312ee731770d1a9a131e7669120b Mon Sep 17 00:00:00 2001
From: Micah Abbott <miabbott@redhat.com>
Date: Fri, 6 May 2022 15:36:12 -0400
Subject: [PATCH 2/2] ci: fetch the 8.6 appstream repo for kata-containers

In order to keep successfully building the extensions, we need access
to the RHEL 8.6 Beta repo to fetch the `qemu-kvm-core` dependency that
`kata-containers` now requires.

This is a one-liner that fetches the 8.6 repos, greps for the
Appstream definition, and replaces the name/id. The output is written
to the existing `ocp.repo` file.
---
 ci/prow-build-test-qemu.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ci/prow-build-test-qemu.sh b/ci/prow-build-test-qemu.sh
index f05333b03..35c0ee15d 100755
--- a/ci/prow-build-test-qemu.sh
+++ b/ci/prow-build-test-qemu.sh
@@ -33,6 +33,9 @@ prev_build_url=${REDIRECTOR_URL}/rhcos-${ocpver}/
 # we want to use RHEL 8.5 for testing until we can start using 8.6
 # see https://github.com/openshift/release/pull/26193
 curl -L http://base-"${ocpver_mut}"-rhel85.ocp.svc.cluster.local > src/config/ocp.repo
+# fetch the 8.6 appstream repo to enable building of extensions
+# see: https://github.com/openshift/os/issues/795
+curl -Ls http://base-"${ocpver_mut}"-rhel86.ocp.svc.cluster.local | grep -A 3 rhel-8-appstream | sed '1,3 s/rhel-8-appstream/rhel-86-appstream/g' >> src/config/ocp.repo
 cosa buildfetch --url=${prev_build_url}
 cosa fetch
 cosa build