From 7811415112bda4adee5cd6ffb6285e0a384b3e7b Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Fri, 3 May 2024 13:22:29 -0700
Subject: [PATCH] utilize extra_repos

---
 iso/empanadas/empanadas/configs/el9-beta.yaml | 11 +++++++----
 iso/empanadas/empanadas/configs/el9.yaml      | 11 +++++++----
 iso/empanadas/empanadas/configs/el9lh.yaml    | 11 +++++++----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/iso/empanadas/empanadas/configs/el9-beta.yaml b/iso/empanadas/empanadas/configs/el9-beta.yaml
index 8d319d8..32a6c9a 100644
--- a/iso/empanadas/empanadas/configs/el9-beta.yaml
+++ b/iso/empanadas/empanadas/configs/el9-beta.yaml
@@ -35,6 +35,13 @@
     - 'SAPHANA'
     - 'extras'
     - 'plus'
+  extra_repos:
+    - name: 'core-common'
+      url: 'https://yumrepofs.build.resf.org/v1/projects/47e0b4a8-84ba-43a9-bb94-eb99dde4cf14/repo/core-common/$basearch'
+      priority: '100'
+    - name: 'core-infra'
+      url: 'https://yumrepofs.build.resf.org/v1/projects/47e0b4a8-84ba-43a9-bb94-eb99dde4cf14/repo/core-infra/$basearch'
+      priority: '100'
   structure:
     packages: 'os/Packages'
     repodata: 'os/repodata'
@@ -142,10 +149,6 @@
       - kiwi
       - kiwi-cli
       - kiwi-systemdeps-image-validation
-    required_project_id: '47e0b4a8-84ba-43a9-bb94-eb99dde4cf14'
-    required_project_repos:
-      - 'core-common'
-      - 'core-infra'
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'
diff --git a/iso/empanadas/empanadas/configs/el9.yaml b/iso/empanadas/empanadas/configs/el9.yaml
index a95bdc6..9352a50 100644
--- a/iso/empanadas/empanadas/configs/el9.yaml
+++ b/iso/empanadas/empanadas/configs/el9.yaml
@@ -35,6 +35,13 @@
     - 'SAPHANA'
     - 'extras'
     - 'plus'
+  extra_repos:
+    - name: 'core-common'
+      url: 'https://yumrepofs.build.resf.org/v1/projects/47e0b4a8-84ba-43a9-bb94-eb99dde4cf14/repo/core-common/$basearch'
+      priority: '100'
+    - name: 'core-infra'
+      url: 'https://yumrepofs.build.resf.org/v1/projects/47e0b4a8-84ba-43a9-bb94-eb99dde4cf14/repo/core-infra/$basearch'
+      priority: '100'
   structure:
     packages: 'os/Packages'
     repodata: 'os/repodata'
@@ -142,10 +149,6 @@
       - kiwi
       - kiwi-cli
       - kiwi-systemdeps-image-validation
-    required_project_id: '47e0b4a8-84ba-43a9-bb94-eb99dde4cf14'
-    required_project_repos:
-      - 'core-common'
-      - 'core-infra'
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'
diff --git a/iso/empanadas/empanadas/configs/el9lh.yaml b/iso/empanadas/empanadas/configs/el9lh.yaml
index 94d5dc0..9c5eea2 100644
--- a/iso/empanadas/empanadas/configs/el9lh.yaml
+++ b/iso/empanadas/empanadas/configs/el9lh.yaml
@@ -35,6 +35,13 @@
     - 'SAPHANA'
     - 'extras'
     - 'plus'
+  extra_repos:
+    - name: 'core-common'
+      url: 'https://yumrepofs.build.resf.org/v1/projects/47e0b4a8-84ba-43a9-bb94-eb99dde4cf14/repo/core-common/$basearch'
+      priority: '100'
+    - name: 'core-infra'
+      url: 'https://yumrepofs.build.resf.org/v1/projects/47e0b4a8-84ba-43a9-bb94-eb99dde4cf14/repo/core-infra/$basearch'
+      priority: '100'
   structure:
     packages: 'os/Packages'
     repodata: 'os/repodata'
@@ -142,10 +149,6 @@
       - kiwi
       - kiwi-cli
       - kiwi-systemdeps-image-validation
-    required_project_id: '47e0b4a8-84ba-43a9-bb94-eb99dde4cf14'
-    required_project_repos:
-      - 'core-common'
-      - 'core-infra'
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'