From d01f69a91d149203126fbc07dbd5528e11907603 Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Wed, 2 Apr 2025 10:48:59 -0400
Subject: [PATCH] extensions: make rhel-9.4-appstream global

There's a subtlety here that's causing issues. Any repo that's available
on all arches needs to be listed in the global repos list. Otherwise,
we may have skew across arches for packages not even related to the
extensions for which the repo was added.

See also: https://issues.redhat.com/browse/OCPBUGS-52293
---
 extensions-ocp-rhel-9.6.yaml | 21 +++++++++++++--------
 extensions-okd-c9s.yaml      |  5 +++++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/extensions-ocp-rhel-9.6.yaml b/extensions-ocp-rhel-9.6.yaml
index ae762ef84..89a930b10 100644
--- a/extensions-ocp-rhel-9.6.yaml
+++ b/extensions-ocp-rhel-9.6.yaml
@@ -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
@@ -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
@@ -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
diff --git a/extensions-okd-c9s.yaml b/extensions-okd-c9s.yaml
index 460d1554e..8b522c466 100644
--- a/extensions-okd-c9s.yaml
+++ b/extensions-okd-c9s.yaml
@@ -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