From 2f8dc3102c2ebdeed268daa11ac4720159ea7110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Wed, 19 Feb 2025 17:15:08 +0100
Subject: [PATCH] fixup! manifests: Add initial c10s based variants

---
 c10s.repo              | 56 +++++++++++++++++++++---------------------
 manifest-okd-c10s.yaml | 18 +++++++-------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/c10s.repo b/c10s.repo
index f69172827..284706713 100644
--- a/c10s.repo
+++ b/c10s.repo
@@ -14,13 +14,13 @@ repo_gpgcheck=0
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
-# [c10s-extras-common]
-# name=CentOS Stream 10 - Extras packages
-# baseurl=https://mirror.stream.centos.org/SIGs/10-stream/extras/$basearch/extras-common
-# gpgcheck=1
-# repo_gpgcheck=0
-# enabled=1
-# gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512
+[c10s-extras-common]
+name=CentOS Stream 10 - Extras packages
+baseurl=https://mirror.stream.centos.org/SIGs/10-stream/extras/$basearch/extras-common
+gpgcheck=1
+repo_gpgcheck=0
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Extras-SHA512
 
 [c10s-nfv]
 name=CentOS Stream 10 - NFV
@@ -38,26 +38,26 @@ repo_gpgcheck=0
 enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official
 
-# [c10s-sig-nfv]
-# name=CentOS Stream 10 - SIG NFV
-# baseurl=https://mirror.stream.centos.org/SIGs/10-stream/nfv/$basearch/openvswitch-2/
-# gpgcheck=1
-# repo_gpgcheck=0
-# enabled=1
-# gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-NFV
+[c10s-sig-nfv]
+name=CentOS Stream 10 - SIG NFV
+baseurl=https://mirror.stream.centos.org/SIGs/10-stream/nfv/$basearch/openvswitch-2/
+gpgcheck=1
+repo_gpgcheck=0
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-NFV
 
-# [c10s-sig-virtualization]
-# name=CentOS Stream 10 - SIG Virtualization
-# baseurl=https://mirror.stream.centos.org/SIGs/10-stream/virt/$basearch/kata-containers/
-# gpgcheck=1
-# repo_gpgcheck=0
-# enabled=1
-# gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Virtualization
+[c10s-sig-virtualization]
+name=CentOS Stream 10 - SIG Virtualization
+baseurl=https://mirror.stream.centos.org/SIGs/10-stream/virt/$basearch/kata-containers/
+gpgcheck=1
+repo_gpgcheck=0
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Virtualization
 
-# [c10s-sig-cloud-okd]
-# name=CentOS Stream 10 - SIG Cloud OKD 4.15
-# baseurl=https://mirror.stream.centos.org/SIGs/10-stream/cloud/$basearch/okd-4.15/
-# gpgcheck=1
-# repo_gpgcheck=0
-# enabled=1
-# gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Cloud
+[c10s-sig-cloud-okd]
+name=CentOS Stream 10 - SIG Cloud OKD 4.19
+baseurl=https://mirror.stream.centos.org/SIGs/10-stream/cloud/$basearch/okd-4.19/
+gpgcheck=1
+repo_gpgcheck=0
+enabled=1
+gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-SIG-Cloud
diff --git a/manifest-okd-c10s.yaml b/manifest-okd-c10s.yaml
index 8af1067d5..6efd0cb02 100644
--- a/manifest-okd-c10s.yaml
+++ b/manifest-okd-c10s.yaml
@@ -17,16 +17,16 @@ include:
 
 # Additional repos we need for OKD components
 repos:
-  # For containernetworking-plugins for cri-o
-  - rhel-9.6-appstream
   # CentOS Extras Common repo for SIG RPM GPG keys
-  # - c10s-extras-common
+  - c10s-extras-common
   # CentOS NFV SIG repo for openvswitch
-  # - c10s-sig-nfv
+  - c10s-sig-nfv
   # For openvswitch
   - rhel-9.6-fast-datapath
   # CentOS Cloud SIG repo for cri-o, cri-tools and conmon-rs
-  # - c10s-sig-cloud-okd
+  - c10s-sig-cloud-okd
+  # For containernetworking-plugins for cri-o
+  - rhel-9.6-appstream
   # Include RHCOS 9 repo for oc, hyperkube
   - rhel-9.6-server-ose-4.19
 
@@ -96,10 +96,10 @@ postprocess:
      ln -s /usr/lib/issue /etc/issue.net
 
 packages:
- # RPM GPG keys for CentOS SIG repos
- # - centos-release-cloud-common
- # - centos-release-nfv-common
- # - centos-release-virt-common
+  # RPM GPG keys for CentOS SIG repos
+  - centos-release-cloud-common
+  # - centos-release-nfv-common
+  - centos-release-virt-common
 
 # Packages pinned to specific repos in SCOS 9
 repo-packages: