iso/empanadas/empanadas/configs/el10.yaml

@@ -11,9 +11,6 @@
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
   fedora_major: '20'
-  gpg_key:
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r10/SOURCES/RPM-GPG-KEY-Rocky-10'
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r10/SOURCES/RPM-GPG-KEY-Rocky-10-Testing'
   allowed_arches:
     - x86_64
     - aarch64
@@ -210,6 +207,9 @@
     git_repo: 'https://git.rockylinux.org/staging/src/rocky-release.git'
     git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r10/'
     branch: 'r10'
+    gpg:
+      stable: 'SOURCES/RPM-GPG-KEY-Rocky-10'
+      testing: 'SOURCES/RPM-GPG-KEY-Rocky-10-Testing'
     list:
       - 'SOURCES/Contributors'
       - 'SOURCES/COMMUNITY-CHARTER'

iso/empanadas/empanadas/configs/el10lh.yaml

@@ -11,9 +11,6 @@
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
   fedora_major: '20'
-  gpg_key:
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r10s/SOURCES/RPM-GPG-KEY-Rocky-10'
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r10s/SOURCES/RPM-GPG-KEY-Rocky-10-Testing'
   allowed_arches:
     - x86_64
     - aarch64
@@ -210,6 +207,9 @@
     git_repo: 'https://git.rockylinux.org/staging/src/rocky-release.git'
     git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r10s/'
     branch: 'r10s'
+    gpg:
+      stable: 'SOURCES/RPM-GPG-KEY-Rocky-10'
+      testing: 'SOURCES/RPM-GPG-KEY-Rocky-10-Testing'
     list:
       - 'SOURCES/Contributors'
       - 'SOURCES/COMMUNITY-CHARTER'

iso/empanadas/empanadas/configs/el8-beta.yaml

@@ -11,9 +11,6 @@
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
   fedora_major: '20'
-  gpg_key:
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r8/SOURCES/RPM-GPG-KEY-rockyofficial'
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r8/SOURCES/RPM-GPG-KEY-rockytesting'
   allowed_arches:
     - x86_64
     - aarch64
@@ -140,6 +137,9 @@
     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'

iso/empanadas/empanadas/configs/el8.yaml

@@ -1,19 +1,16 @@
 ---
 '8':
   fullname: 'Rocky Linux 8'
-  revision: '8.10'
+  revision: '8.9'
   rclvl: 'RC1'
   major: '8'
-  minor: '10'
+  minor: '9'
   profile: '8'
   disttag: 'el8'
   code: "Green Obsidian"
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
   fedora_major: '20'
-  gpg_key:
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r8/SOURCES/RPM-GPG-KEY-rockyofficial'
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r8/SOURCES/RPM-GPG-KEY-rockytesting'
   allowed_arches:
     - x86_64
     - aarch64
@@ -82,59 +79,26 @@
         format: vhd
         variants: [Base, LVM]
         primary_variant: 'Base'
-        kiwi:
-          type: "oem"
-          profile_names:
-            - Cloud-Azure-Base
-            - Cloud-Azure-LVM
       EC2:
         format: qcow2
         variants: [Base, LVM]
         primary_variant: 'Base'
-        kiwi:
-          type: "oem"
-          profile_names:
-            - Cloud-EC2-Base
-            - Cloud-EC2-LVM
       GenericCloud:
         format: qcow2
         variants: [Base, LVM]
         primary_variant: 'Base'
-        kiwi:
-          type: "oem"
-          profile_names:
-            - Cloud-GenericCloud-Base
-            - Cloud-GenericCloud-LVM
       Container:
         format: tar.xz
-        variants: [Base, Minimal, Toolbox, UBI]
+        variants: [Base, Minimal, UBI, WSL]
-        kiwi:
-          type: "oci"
-          profile_names:
-            - Container-Base
-            - Container-Minimal
-            - Container-Toolbox
-            - Container-UBI
       RPI:
         format: raw.xz
       OCP:
         format: qcow2
         variants: [Base]
-        kiwi:
-          type: "oem"
-          profile_names:
-            - Cloud-OCP-Base
       Vagrant:
         format: box
         variants: [Libvirt, Vbox, VMware]
-        kiwi:
-          type: "oem"
-          profile_names:
-            - Vagrant-Libvirt
-            - Vagrant-Vbox
-            - Vagrant-VMware
   livemap:
-    builder: "lorax"
     git_repo: 'https://git.resf.org/sig_core/kickstarts.git'
     branch: 'r8'
     ksentry:
@@ -178,6 +142,9 @@
     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'

iso/empanadas/empanadas/configs/el8lh.yaml

@@ -11,9 +11,6 @@
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
   fedora_major: '20'
-  gpg_key:
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r8/SOURCES/RPM-GPG-KEY-rockyofficial'
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r8/SOURCES/RPM-GPG-KEY-rockytesting'
   allowed_arches:
     - x86_64
     - aarch64
@@ -140,6 +137,9 @@
     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'

iso/empanadas/empanadas/configs/el9-beta.yaml

@@ -11,9 +11,6 @@
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
   fedora_major: '20'
-  gpg_key:
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r9-beta/SOURCES/RPM-GPG-KEY-Rocky-9'
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r9-beta/SOURCES/RPM-GPG-KEY-Rocky-9-Testing'
   allowed_arches:
     - x86_64
     - aarch64
@@ -217,6 +214,9 @@
     git_repo: 'https://git.rockylinux.org/staging/src/rocky-release.git'
     git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r9/'
     branch: 'r9-beta'
+    gpg:
+      stable: 'SOURCES/RPM-GPG-KEY-Rocky-9'
+      testing: 'SOURCES/RPM-GPG-KEY-Rocky-9-Testing'
     list:
       - 'SOURCES/Contributors'
       - 'SOURCES/COMMUNITY-CHARTER'

iso/empanadas/empanadas/configs/el9.yaml

@@ -11,9 +11,6 @@
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
   fedora_major: '20'
-  gpg_key:
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r9/SOURCES/RPM-GPG-KEY-Rocky-9'
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r9/SOURCES/RPM-GPG-KEY-Rocky-9-Testing'
   allowed_arches:
     - x86_64
     - aarch64
@@ -217,6 +214,9 @@
     git_repo: 'https://git.rockylinux.org/staging/src/rocky-release.git'
     git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r9/'
     branch: 'r9'
+    gpg:
+      stable: 'SOURCES/RPM-GPG-KEY-Rocky-9'
+      testing: 'SOURCES/RPM-GPG-KEY-Rocky-9-Testing'
     list:
       - 'SOURCES/Contributors'
       - 'SOURCES/COMMUNITY-CHARTER'

iso/empanadas/empanadas/configs/el9alt.yaml

@@ -12,9 +12,6 @@
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
   fedora_major: '20'
-  gpg_key:
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r9/SOURCES/RPM-GPG-KEY-Rocky-9'
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r9/SOURCES/RPM-GPG-KEY-Rocky-9-Testing'
   allowed_arches:
     - armv7hl
     - riscv64
@@ -50,6 +47,9 @@
     git_repo: 'https://git.rockylinux.org/staging/src/rocky-release.git'
     git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r9/'
     branch: 'r9'
+    gpg:
+      stable: 'SOURCES/RPM-GPG-KEY-Rocky-9'
+      testing: 'SOURCES/RPM-GPG-KEY-Rocky-9-Testing'
     list:
       - 'SOURCES/Contributors'
       - 'SOURCES/COMMUNITY-CHARTER'

iso/empanadas/empanadas/configs/el9lh.yaml

@@ -11,9 +11,6 @@
   bugurl: 'https://bugs.rockylinux.org'
   checksum: 'sha256'
   fedora_major: '20'
-  gpg_key:
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r9s/SOURCES/RPM-GPG-KEY-Rocky-9'
-    - 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r9s/SOURCES/RPM-GPG-KEY-Rocky-9-Testing'
   allowed_arches:
     - x86_64
     - aarch64
@@ -217,6 +214,9 @@
     git_repo: 'https://git.rockylinux.org/staging/src/rocky-release.git'
     git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release/-/raw/r9/'
     branch: 'r9s'
+    gpg:
+      stable: 'SOURCES/RPM-GPG-KEY-Rocky-9'
+      testing: 'SOURCES/RPM-GPG-KEY-Rocky-9-Testing'
     list:
       - 'SOURCES/Contributors'
       - 'SOURCES/COMMUNITY-CHARTER'

iso/empanadas/empanadas/sig/altarch.yaml

@@ -3,8 +3,6 @@ altarch:
   '8':
     profile: 'altarch'
     project_id: 'a1aac235-dd66-4d5b-8ff0-87467732f322'
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-altarch/-/raw/r8/SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch'
     repo:
       altarch-common:
         allowed_arches:
@@ -21,13 +19,13 @@ altarch:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-altarch.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-altarch/-/raw/r8/'
       branch: 'r8'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch'
   '9':
     profile: 'altarch'
     project_id: '6047887d-a395-4bc7-a0bd-fc1873b5d13d'
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-altarch/-/raw/r9/SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch'
     repo:
       altarch-common:
         allowed_arches:
@@ -44,6 +42,8 @@ altarch:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-altarch.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-altarch/-/raw/r9/'
       branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-AltArch'
 ...

iso/empanadas/empanadas/sig/cloud.yaml

@@ -4,8 +4,6 @@ cloud:
     profile: 'cloud'
     project_id: 'f91da90d-5bdb-4cf2-80ea-e07f8dae5a5c'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-cloud/-/raw/r8/SOURCES/RPM-GPG-KEY-Rocky-SIG-Cloud'
     repo:
       cloud-kernel:
         allowed_arches:
@@ -19,14 +17,14 @@ cloud:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-cloud.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-cloud/-/raw/r8/'
       branch: 'r8'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Cloud'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Cloud'
   '9':
     profile: 'cloud'
     project_id: '15016370-1410-4459-a1a2-a1576041fd19'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-cloud/-/raw/r9/SOURCES/RPM-GPG-KEY-Rocky-SIG-Cloud'
     repo:
       cloud-kernel:
         allowed_arches:
@@ -42,6 +40,8 @@ cloud:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-cloud.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-cloud/-/raw/r9/'
       branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Cloud'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Cloud'
 ...

iso/empanadas/empanadas/sig/core.yaml

@@ -4,8 +4,6 @@ core:
     profile: 'core'
     project_id: '91e0dd2f-448e-4b75-9066-3946aceb60db'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-core/-/raw/r8/SOURCES/RPM-GPG-KEY-Rocky-SIG-Core'
     repo:
       core-common:
         allowed_arches:
@@ -19,14 +17,14 @@ core:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-core.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-core/-/raw/r8/'
       branch: 'r8'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Core'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Core'
   '9':
     profile: 'core'
     project_id: '47e0b4a8-84ba-43a9-bb94-eb99dde4cf14'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-core/-/raw/r9/SOURCES/RPM-GPG-KEY-Rocky-SIG-Core'
     repo:
       core-common:
         allowed_arches:
@@ -44,6 +42,8 @@ core:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-core.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-core/-/raw/r9/'
       branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Core'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Core'
 ...

iso/empanadas/empanadas/sig/desktop.yaml

@@ -4,8 +4,6 @@ desktop:
     profile: 'desktop'
     project_id: '8b3c9b53-0633-47bd-98a3-1ca3ec141278'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-desktop/-/raw/r8/SOURCES/RPM-GPG-KEY-Rocky-SIG-Desktop'
     repo:
       desktop-common:
         allowed_arches:
@@ -15,14 +13,14 @@ desktop:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-desktop.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-desktop/-/raw/r8/'
       branch: 'r8'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Desktop'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Desktop'
   '9':
     profile: 'desktop'
     project_id: 'b0460c25-22cf-496c-a3a3-067b9a2af14a'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-desktop/-/raw/r9/SOURCES/RPM-GPG-KEY-Rocky-SIG-Desktop'
     repo:
       desktop-common:
         allowed_arches:
@@ -32,6 +30,8 @@ desktop:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-desktop.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-desktop/-/raw/r9/'
       branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Desktop'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Desktop'
 ...

iso/empanadas/empanadas/sig/fasttrack.yaml

@@ -4,8 +4,6 @@ fasttrack:
     profile: 'fasttrack'
     project_id: ''
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-fasttrack/-/raw/r8/SOURCES/RPM-GPG-KEY-Rocky-SIG-FastTrack'
     repo:
       fasttrack-common:
         allowed_arches:
@@ -15,14 +13,14 @@ fasttrack:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-fasttrack.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-fasttrack/-/raw/r8/'
       branch: 'r8'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-FastTrack'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-FastTrack'
   '9':
     profile: 'fasttrack'
     project_id: ''
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-fasttrack/-/raw/r9/SOURCES/RPM-GPG-KEY-Rocky-SIG-FastTrack'
     repo:
       fasttrack-common:
         allowed_arches:
@@ -34,6 +32,8 @@ fasttrack:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-fasttrack.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-fasttrack/-/raw/r9/'
       branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-FastTrack'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-FastTrack'
 ...

iso/empanadas/empanadas/sig/hpc.yaml

@@ -4,8 +4,6 @@ hpc:
     profile: 'hpc'
     project_id: '78a2db02-ebe5-4654-9a04-6482eb9c8b84'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-hpc/-/raw/r8/SOURCES/RPM-GPG-KEY-Rocky-SIG-HPC'
     repo:
       hpc-common:
         allowed_arches:
@@ -19,14 +17,14 @@ hpc:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-hpc.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-hpc/-/raw/r8/'
       branch: 'r8'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-HPC'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-HPC'
   '9':
     profile: 'hpc'
     project_id: 'aee28795-e163-4a99-935d-f0a78cf33e75'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-hpc/-/raw/r9/SOURCES/RPM-GPG-KEY-Rocky-SIG-HPC'
     repo:
       hpc-common:
         allowed_arches:
@@ -44,6 +42,8 @@ hpc:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-hpc.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-hpc/-/raw/r9/'
       branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-HPC'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-HPC'
 ...

iso/empanadas/empanadas/sig/kernel.yaml

@@ -4,8 +4,6 @@ kernel:
     profile: 'kernel'
     project_id: '13172560-6e5d-4e65-ae71-750f99096856'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-kernel/-/raw/r8/SOURCES/RPM-GPG-KEY-Rocky-SIG-Kernel'
     repo:
       kernel-lts:
         allowed_arches:
@@ -23,14 +21,14 @@ kernel:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-kernel.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-kernel/-/raw/r8/'
       branch: 'r8'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Kernel'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Kernel'
   '9':
     profile: 'kernel'
     project_id: '708f99fe-7e89-4241-959a-4ff259786b4a'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-kernel/-/raw/r9/SOURCES/RPM-GPG-KEY-Rocky-SIG-Kernel'
     repo:
       kernel-lts:
         allowed_arches:
@@ -54,6 +52,8 @@ kernel:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-kernel.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-kernel/-/raw/r9/'
       branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Kernel'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Kernel'
 ...

iso/empanadas/empanadas/sig/security.yaml

@@ -4,8 +4,6 @@ security:
     profile: 'security'
     project_id: '41baa8a8-7dbe-46fe-9f0b-4e2420372bbc'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-security/-/raw/r8/SOURCES/RPM-GPG-KEY-Rocky-SIG-Security'
     repo:
       security-common:
         allowed_arches:
@@ -15,14 +13,14 @@ security:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-security.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-security/-/raw/r8/'
       branch: 'r8'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Security'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Security'
   '9':
     profile: 'security'
     project_id: '041a90b2-51f5-44a4-8be8-b2905c1ad95b'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-security/-/raw/r9/SOURCES/RPM-GPG-KEY-Rocky-SIG-Security'
     repo:
       security-common:
         allowed_arches:
@@ -34,6 +32,8 @@ security:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-security.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-security/-/raw/r9/'
       branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Security'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Security'
 ...

iso/empanadas/empanadas/sig/virt.yaml

@@ -4,8 +4,6 @@ virt:
     profile: 'virt'
     project_id: 'd911867a-658e-4f41-8343-5ceac6c41f67'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-virt/-/raw/r8/SOURCES/RPM-GPG-KEY-Rocky-SIG-Virt'
     repo:
       virt-common:
         allowed_arches:
@@ -15,14 +13,14 @@ virt:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-virt.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-virt/-/raw/r8/'
       branch: 'r8'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Virt'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Virt'
   '9':
     profile: 'virt'
     project_id: '925ceece-47ce-4f51-90f7-ff8689e4fe5e'
     addtional_dirs: []
-    gpg_key:
-      - 'https://git.rockylinux.org/staging/src/rocky-release-virt/-/raw/r9/SOURCES/RPM-GPG-KEY-Rocky-SIG-Virt'
     repo:
       virt-common:
         allowed_arches:
@@ -33,6 +31,8 @@ virt:
       git_repo: 'https://git.rockylinux.org/staging/src/rocky-release-virt.git'
       git_raw_path: 'https://git.rockylinux.org/staging/src/rocky-release-virt/-/raw/r9/'
       branch: 'r9'
+      gpg:
+        stable: 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Virt'
       list:
         - 'SOURCES/RPM-GPG-KEY-Rocky-SIG-Virt'
 ...

iso/empanadas/empanadas/templates/repoconfig.tmpl

@@ -5,7 +5,7 @@ baseurl={{ repo.baseurl }}
 enabled=1
 gpgcheck={{ gpg_check }}
 repo_gpgcheck={{ repo_gpg_check }}
-gpgkey={{ repo.gpgkey|join(' ') }}
+gpgkey={{ repo.gpgkey }}
 
 [{{ repo.name }}-debug]
 name={{repo.name}}
@@ -13,7 +13,7 @@ baseurl={{ repo.baseurl }}-debug
 enabled=1
 gpgcheck={{ gpg_check }}
 repo_gpgcheck={{ repo_gpg_check }}
-gpgkey={{ repo.gpgkey|join(' ') }}
+gpgkey={{ repo.gpgkey }}
 
 [{{ repo.name }}-source]
 name={{repo.name}}
@@ -21,6 +21,6 @@ baseurl={{ repo.srcbaseurl }}
 enabled=1
 gpgcheck={{ gpg_check }}
 repo_gpgcheck={{ repo_gpg_check }}
-gpgkey={{ repo.gpgkey|join(' ') }}
+gpgkey={{ repo.gpgkey }}
 
 {% endfor %}

iso/empanadas/empanadas/templates/reposync-src.tmpl

@@ -1,8 +1,6 @@
 #!/bin/bash
 set -o pipefail
-{% for key in gpg_key_list %}
+{{ import_gpg_cmd }} | tee -a {{ sync_log }}
-{{ import_gpg_cmd }} {{ key }} | tee -a {{ sync_log }}
-{% endfor %}
 {{ dnf_plugin_cmd }} | tee -a {{ sync_log }}
 sed -i 's/enabled=1/enabled=0/g' /etc/yum.repos.d/*.repo
 {{ metadata_cmd }} | tee -a {{ sync_log }}

iso/empanadas/empanadas/templates/reposync.tmpl

@@ -1,8 +1,6 @@
 #!/bin/bash
 set -o pipefail
-{% for key in gpg_key_list %}
+{{ import_gpg_cmd }} | tee -a {{ sync_log }}
-{{ import_gpg_cmd }} {{ key }} | tee -a {{ sync_log }}
-{% endfor %}
 {{ arch_force_cp }} | tee -a {{ sync_log }}
 {{ dnf_plugin_cmd }} | tee -a {{ sync_log }}
 sed -i 's/enabled=1/enabled=0/g' /etc/yum.repos.d/*.repo

iso/empanadas/empanadas/util/dnf_utils.py

@@ -53,6 +53,7 @@ class RepoSync:
             dryrun: bool = False,
             fullrun: bool = False,
             nofail: bool = False,
+            gpgkey: str = 'stable',
             gpg_check: bool = True,
             repo_gpg_check: bool = True,
             rlmode: str = 'stable',
@@ -105,9 +106,7 @@ class RepoSync:
         self.multilib = rlvars['provide_multilib']
         self.repo = repo
         self.extra_files = rlvars['extra_files']
-        self.gpgkey = rlvars['gpg_key']
+        self.gpgkey = gpgkey
-        if 'repo_gpg_key' in rlvars:
-            self.gpgkey = rlvars['gpg_key'] + rlvars['repo_gpg_key']
         self.checksum = rlvars['checksum']
         self.gpg_check = gpg_check
         self.repo_gpg_check = repo_gpg_check
@@ -349,6 +348,7 @@ class RepoSync:
         reposync_delete = '--delete' if self.reposync_clean_old else ''
         self.log.info('Generating container entries')
         entries_dir = os.path.join(work_root, "entries")
+        gpg_key_url = self.extra_files['git_raw_path'] + self.extra_files['gpg'][self.gpgkey]
         if not os.path.exists(entries_dir):
             os.makedirs(entries_dir, exist_ok=True)
 
@@ -412,8 +412,7 @@ class RepoSync:
                         'debug/tree'
                 )
 
-                gpg_key_list = self.gpgkey
+                import_gpg_cmd = f"/usr/bin/rpm --import {gpg_key_url}"
-                import_gpg_cmd = f"/usr/bin/rpm --import"
                 arch_force_cp = f"/usr/bin/sed 's|$basearch|{a}|g' "\
                         f"{self.dnf_config} > {self.dnf_config}.{a}"
 
@@ -438,7 +437,6 @@ class RepoSync:
 
                 sync_template = self.tmplenv.get_template('reposync.tmpl')
                 sync_output = sync_template.render(
-                        gpg_key_list=gpg_key_list,
                         import_gpg_cmd=import_gpg_cmd,
                         arch_force_cp=arch_force_cp,
                         dnf_plugin_cmd=dnf_plugin_cmd,
@@ -450,7 +448,6 @@ class RepoSync:
 
                 debug_sync_template = self.tmplenv.get_template('reposync.tmpl')
                 debug_sync_output = debug_sync_template.render(
-                        gpg_key_list=gpg_key_list,
                         import_gpg_cmd=import_gpg_cmd,
                         arch_force_cp=arch_force_cp,
                         dnf_plugin_cmd=dnf_plugin_cmd,
@@ -501,7 +498,6 @@ class RepoSync:
 
                     ks_sync_template = self.tmplenv.get_template('reposync.tmpl')
                     ks_sync_output = ks_sync_template.render(
-                            gpg_key_list=gpg_key_list,
                             import_gpg_cmd=import_gpg_cmd,
                             arch_force_cp=arch_force_cp,
                             dnf_plugin_cmd=dnf_plugin_cmd,
@@ -542,7 +538,6 @@ class RepoSync:
 
                 source_sync_template = self.tmplenv.get_template('reposync-src.tmpl')
                 source_sync_output = source_sync_template.render(
-                        gpg_key_list=gpg_key_list,
                         import_gpg_cmd=import_gpg_cmd,
                         dnf_plugin_cmd=dnf_plugin_cmd,
                         sync_cmd=source_sync_cmd,
@@ -1598,6 +1593,7 @@ class SigRepoSync:
             dryrun: bool = False,
             fullrun: bool = False,
             nofail: bool = False,
+            gpgkey: str = 'stable',
             gpg_check: bool = True,
             repo_gpg_check: bool = True,
             extra_dnf_args=None,
@@ -1640,9 +1636,7 @@ class SigRepoSync:
         self.sigvars = sigvars
         self.sigrepos = sigvars['repo'].keys()
         self.extra_files = sigvars['extra_files']
-        self.gpgkey = sigvars['gpg_key']
+        self.gpgkey = gpgkey
-        if 'repo_gpg_key' in sigvars:
-            self.gpgkey = sigvars['gpg_key'] + sigvars['repo_gpg_key']
         #self.arches = sigvars['allowed_arches']
         self.project_id = sigvars['project_id']
         if 'additional_dirs' in sigvars:
@@ -1867,6 +1861,7 @@ class SigRepoSync:
         reposync_delete = '--delete' if self.reposync_clean_old else ''
         self.log.info('Generating container entries')
         entries_dir = os.path.join(work_root, "entries")
+        gpg_key_url = self.extra_files['git_raw_path'] + self.extra_files['gpg'][self.gpgkey]
         if not os.path.exists(entries_dir):
             os.makedirs(entries_dir, exist_ok=True)
 
@@ -1926,8 +1921,7 @@ class SigRepoSync:
                         r + '-debug'
                 )
 
-                gpg_key_list = self.gpgkey
+                import_gpg_cmd = f"/usr/bin/rpm --import {gpg_key_url}"
-                import_gpg_cmd = f"/usr/bin/rpm --import"
                 arch_force_cp = f"/usr/bin/sed 's|$basearch|{a}|g' {self.dnf_config} > {self.dnf_config}.{a}"
                 sync_log = f"{log_root}/{repo_name}-{a}.log"
                 debug_sync_log = f"{log_root}/{repo_name}-{a}-debug.log"
@@ -1951,7 +1945,6 @@ class SigRepoSync:
 
                 sync_template = self.tmplenv.get_template('reposync.tmpl')
                 sync_output = sync_template.render(
-                        gpg_key_list=gpg_key_list,
                         import_gpg_cmd=import_gpg_cmd,
                         arch_force_cp=arch_force_cp,
                         dnf_plugin_cmd=dnf_plugin_cmd,
@@ -1959,12 +1952,12 @@ class SigRepoSync:
                         metadata_cmd=metadata_cmd,
                         sync_log=sync_log,
                         download_path=os_sync_path,
+                        gpg_key_url=gpg_key_url,
                         deploy_extra_files=True
                 )
 
                 debug_sync_template = self.tmplenv.get_template('reposync.tmpl')
                 debug_sync_output = debug_sync_template.render(
-                        gpg_key_list=gpg_key_list,
                         import_gpg_cmd=import_gpg_cmd,
                         arch_force_cp=arch_force_cp,
                         dnf_plugin_cmd=dnf_plugin_cmd,
@@ -1972,6 +1965,7 @@ class SigRepoSync:
                         metadata_cmd=debug_metadata_cmd,
                         sync_log=debug_sync_log,
                         download_path=debug_sync_path,
+                        gpg_key_url=gpg_key_url,
                         deploy_extra_files=True
                 )
 
@@ -2025,13 +2019,13 @@ class SigRepoSync:
 
                 source_sync_template = self.tmplenv.get_template('reposync-src.tmpl')
                 source_sync_output = source_sync_template.render(
-                        gpg_key_list=gpg_key_list,
                         import_gpg_cmd=import_gpg_cmd,
                         dnf_plugin_cmd=dnf_plugin_cmd,
                         sync_cmd=source_sync_cmd,
                         metadata_cmd=source_metadata_cmd,
                         sync_log=source_sync_log,
                         download_path=debug_sync_path,
+                        gpg_key_url=gpg_key_url,
                         deploy_extra_files=True
                 )
 

iso/empanadas/empanadas/util/shared.py

@@ -496,7 +496,7 @@ class Shared:
                     'name': repo,
                     'baseurl': constructed_url,
                     'srcbaseurl': constructed_url_src,
-                    'gpgkey': gpgkey
+                    'gpgkey': extra_files['git_raw_path'] + extra_files['gpg'][gpgkey]
             }
             repolist.append(repodata)
 

sync/common_8

@@ -3,8 +3,8 @@
 # Revision must always start with a major number
 case "${RLREL}" in
   stable)
-    REVISION=8.10
+    REVISION=8.9
-    PREREV=8.9
+    PREREV=8.8
     APPEND_TO_DIR="-RC2"
     ;;
   beta)