From f97546ca4ab7b438192a0eceedbc7699332b4094 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Fri, 23 Sep 2022 10:44:21 -0700
Subject: [PATCH] Add r8 beta and lh

---
 iso/empanadas/empanadas/configs/el8-beta.yaml | 137 ++++++++++++++++++
 iso/empanadas/empanadas/configs/el8.yaml      |  29 +---
 iso/empanadas/empanadas/configs/el8lh.yaml    | 137 ++++++++++++++++++
 3 files changed, 282 insertions(+), 21 deletions(-)
 create mode 100644 iso/empanadas/empanadas/configs/el8-beta.yaml
 create mode 100644 iso/empanadas/empanadas/configs/el8lh.yaml

diff --git a/iso/empanadas/empanadas/configs/el8-beta.yaml b/iso/empanadas/empanadas/configs/el8-beta.yaml
new file mode 100644
index 0000000..972bd57
--- /dev/null
+++ b/iso/empanadas/empanadas/configs/el8-beta.yaml
@@ -0,0 +1,137 @@
+---
+'8':
+  fullname: 'Rocky Linux 8'
+  revision: '8.7'
+  rclvl: 'RC1'
+  major: '8'
+  minor: '7'
+  profile: '8'
+  bugurl: 'https://bugs.rockylinux.org'
+  checksum: 'sha256'
+  fedora_major: '20'
+  allowed_arches:
+    - x86_64
+    - aarch64
+  provide_multilib: False
+  project_id: '26694529-26cd-44bd-bc59-1c1195364322'
+  repo_symlinks:
+    devel: 'Devel'
+    NFV: 'nfv'
+  renames:
+    all: 'devel'
+  all_repos:
+    - 'BaseOS'
+    - 'AppStream'
+    - 'PowerTools'
+    - 'HighAvailability'
+    - 'ResilientStorage'
+    - 'RT'
+    - 'NFV'
+    - 'extras'
+    - 'devel'
+    - 'plus'
+  structure:
+    packages: 'os/Packages'
+    repodata: 'os/repodata'
+  iso_map:
+    xorrisofs: False
+    iso_level: False
+    images:
+      dvd:
+        disc: True
+        variant: 'AppStream'
+        repos:
+          - 'BaseOS'
+          - 'AppStream'
+      minimal:
+        disc: True
+        isoskip: True
+        repos:
+          - 'minimal'
+          - 'BaseOS'
+        variant: 'minimal'
+      BaseOS:
+        disc: False
+        isoskip: True
+        variant: 'BaseOS'
+        repos:
+          - 'BaseOS'
+          - 'AppStream'
+    lorax:
+      repos:
+        - 'BaseOS'
+        - 'AppStream'
+      variant: 'BaseOS'
+      lorax_removes:
+        - 'libreport-rhel-anaconda-bugzilla'
+      required_pkgs:
+        - 'lorax'
+        - 'genisoimage'
+        - 'isomd5sum'
+        - 'lorax-templates-rhel'
+        - 'lorax-templates-generic'
+        - 'xorriso'
+  cloudimages:
+    images:
+      EC2:
+        format: raw
+      GenericCloud:
+        format: qcow2
+  livemap:
+    git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
+    branch: 'r8'
+    ksentry:
+      Workstation: rocky-live-workstation.ks
+      Workstation-Lite: rocky-live-workstation-lite.ks
+      XFCE: rocky-live-xfce.ks
+      KDE: rocky-live-kde.ks
+    allowed_arches:
+      - x86_64
+    required_pkgs:
+      - 'lorax-lmc-novirt'
+      - 'vim-minimal'
+      - 'pykickstart'
+      - 'git'
+  variantmap:
+    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
+    branch: 'r8-beta'
+    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r8-beta/'
+  repoclosure_map:
+    arches:
+      x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'
+      aarch64: '--forcearch=aarch64 --arch=aarch64 --arch=noarch'
+      ppc64le: '--forcearch=ppc64le --arch=ppc64le --arch=noarch'
+      s390x: '--forcearch=s390x --arch=s390x --arch=noarch'
+    repos:
+      BaseOS: []
+      AppStream:
+        - BaseOS
+      PowerTools:
+        - BaseOS
+        - AppStream
+      HighAvailability:
+        - BaseOS
+        - AppStream
+      ResilientStorage:
+        - BaseOS
+        - AppStream
+      RT:
+        - BaseOS
+        - AppStream
+      NFV:
+        - BaseOS
+        - AppStream
+  extra_files:
+    git_repo: 'https://git.rockylinux.org/staging/src/rocky-release.git'
+    git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r8/'
+    branch: 'r8'
+    gpg:
+      stable: 'SOURCES/RPM-GPG-KEY-rockyofficial'
+      testing: 'SOURCES/RPM-GPG-KEY-rockytesting'
+    list:
+      - 'SOURCES/COMMUNITY-CHARTER'
+      - 'SOURCES/EULA'
+      - 'SOURCES/LICENSE'
+      - 'SOURCES/RPM-GPG-KEY-rockyofficial'
+      - 'SOURCES/RPM-GPG-KEY-rockytesting'
+...
diff --git a/iso/empanadas/empanadas/configs/el8.yaml b/iso/empanadas/empanadas/configs/el8.yaml
index a011d95..bf40ccb 100644
--- a/iso/empanadas/empanadas/configs/el8.yaml
+++ b/iso/empanadas/empanadas/configs/el8.yaml
@@ -1,22 +1,24 @@
 ---
 '8':
   fullname: 'Rocky Linux 8'
-  revision: '8.6'
-  rclvl: 'RC2'
+  revision: '8.7'
+  rclvl: 'RC1'
   major: '8'
-  minor: '6'
+  minor: '7'
   profile: '8'
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
+  fedora_major: '20'
   allowed_arches:
     - x86_64
     - aarch64
   provide_multilib: False
-  project_id: ''
+  project_id: 'e9cfc87c-d2d2-42d5-a121-852101f1a966'
   repo_symlinks:
     devel: 'Devel'
     NFV: 'nfv'
-  renames: {}
+  renames:
+    all: 'devel'
   all_repos:
     - 'BaseOS'
     - 'AppStream'
@@ -28,21 +30,6 @@
     - 'extras'
     - 'devel'
     - 'plus'
-  no_comps_or_groups:
-    - 'extras'
-    - 'devel'
-    - 'plus'
-  comps_or_groups:
-    - 'BaseOS'
-    - 'AppStream'
-    - 'PowerTools'
-    - 'HighAvailability'
-    - 'ResilientStorage'
-    - 'RT'
-    - 'NFV'
-  has_modules:
-    - 'AppStream'
-    - 'PowerTools'
   structure:
     packages: 'os/Packages'
     repodata: 'os/repodata'
@@ -92,7 +79,7 @@
         format: qcow2
   livemap:
     git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
-    branch: 'r9'
+    branch: 'r8'
     ksentry:
       Workstation: rocky-live-workstation.ks
       Workstation-Lite: rocky-live-workstation-lite.ks
diff --git a/iso/empanadas/empanadas/configs/el8lh.yaml b/iso/empanadas/empanadas/configs/el8lh.yaml
new file mode 100644
index 0000000..0cace3d
--- /dev/null
+++ b/iso/empanadas/empanadas/configs/el8lh.yaml
@@ -0,0 +1,137 @@
+---
+'8':
+  fullname: 'Rocky Linux 8'
+  revision: '8.8'
+  rclvl: 'RC1'
+  major: '8'
+  minor: '8'
+  profile: '8'
+  bugurl: 'https://bugs.rockylinux.org'
+  checksum: 'sha256'
+  fedora_major: '20'
+  allowed_arches:
+    - x86_64
+    - aarch64
+  provide_multilib: False
+  project_id: '3b0e9ec7-0679-4176-b253-8528eb3255eb'
+  repo_symlinks:
+    devel: 'Devel'
+    NFV: 'nfv'
+  renames:
+    all: 'devel'
+  all_repos:
+    - 'BaseOS'
+    - 'AppStream'
+    - 'PowerTools'
+    - 'HighAvailability'
+    - 'ResilientStorage'
+    - 'RT'
+    - 'NFV'
+    - 'extras'
+    - 'devel'
+    - 'plus'
+  structure:
+    packages: 'os/Packages'
+    repodata: 'os/repodata'
+  iso_map:
+    xorrisofs: False
+    iso_level: False
+    images:
+      dvd:
+        disc: True
+        variant: 'AppStream'
+        repos:
+          - 'BaseOS'
+          - 'AppStream'
+      minimal:
+        disc: True
+        isoskip: True
+        repos:
+          - 'minimal'
+          - 'BaseOS'
+        variant: 'minimal'
+      BaseOS:
+        disc: False
+        isoskip: True
+        variant: 'BaseOS'
+        repos:
+          - 'BaseOS'
+          - 'AppStream'
+    lorax:
+      repos:
+        - 'BaseOS'
+        - 'AppStream'
+      variant: 'BaseOS'
+      lorax_removes:
+        - 'libreport-rhel-anaconda-bugzilla'
+      required_pkgs:
+        - 'lorax'
+        - 'genisoimage'
+        - 'isomd5sum'
+        - 'lorax-templates-rhel'
+        - 'lorax-templates-generic'
+        - 'xorriso'
+  cloudimages:
+    images:
+      EC2:
+        format: raw
+      GenericCloud:
+        format: qcow2
+  livemap:
+    git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
+    branch: 'r8'
+    ksentry:
+      Workstation: rocky-live-workstation.ks
+      Workstation-Lite: rocky-live-workstation-lite.ks
+      XFCE: rocky-live-xfce.ks
+      KDE: rocky-live-kde.ks
+    allowed_arches:
+      - x86_64
+    required_pkgs:
+      - 'lorax-lmc-novirt'
+      - 'vim-minimal'
+      - 'pykickstart'
+      - 'git'
+  variantmap:
+    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
+    branch: 'r8s'
+    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r8s/'
+  repoclosure_map:
+    arches:
+      x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'
+      aarch64: '--forcearch=aarch64 --arch=aarch64 --arch=noarch'
+      ppc64le: '--forcearch=ppc64le --arch=ppc64le --arch=noarch'
+      s390x: '--forcearch=s390x --arch=s390x --arch=noarch'
+    repos:
+      BaseOS: []
+      AppStream:
+        - BaseOS
+      PowerTools:
+        - BaseOS
+        - AppStream
+      HighAvailability:
+        - BaseOS
+        - AppStream
+      ResilientStorage:
+        - BaseOS
+        - AppStream
+      RT:
+        - BaseOS
+        - AppStream
+      NFV:
+        - BaseOS
+        - AppStream
+  extra_files:
+    git_repo: 'https://git.rockylinux.org/staging/src/rocky-release.git'
+    git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r8/'
+    branch: 'r8'
+    gpg:
+      stable: 'SOURCES/RPM-GPG-KEY-rockyofficial'
+      testing: 'SOURCES/RPM-GPG-KEY-rockytesting'
+    list:
+      - 'SOURCES/COMMUNITY-CHARTER'
+      - 'SOURCES/EULA'
+      - 'SOURCES/LICENSE'
+      - 'SOURCES/RPM-GPG-KEY-rockyofficial'
+      - 'SOURCES/RPM-GPG-KEY-rockytesting'
+...