mangle: oval.sh contains a broken podman command

Signed-off-by: Louis Abel <label@rockylinux.org>

func/core/pkg_acl/00-install-acl.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 r_log "acl" "Install the acl package"
 p_installPackageNormal acl
+p_installPackageNormal attr
 # This normally is not needed.
 #r_log "acl" "Remount filesystems with ACL support"
 #mount -o remount,acl /

func/core/pkg_acl/11-test-acl-xattr.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+ACLIMG=/tmp/testacl.img
+r_log "acl" "Test the use of xattr"
+touch "${ACLIMG}"
+trap '/bin/rm -f ${ACLIMG}' EXIT
+
+# Use setfacl for readonly
+r_log "acl" "Create image"
+dd if=/dev/zero of=${ACLIMG} bs=1024000 count=100
+echo -e 'y\n' | mkfs.ext3 "${ACLIMG}"
+mkdir /mnt/xattr
+mount -t ext3 -o loop,user_xattr "${ACLIMG}" /mnt/xattr
+touch /mnt/xattr/testfile
+
+r_log "acl" "Apply attrs as needed"
+setfattr -n user.nobody /mnt/xattr/testfile
+getfattr /mnt/xattr/testfile | grep -q 'user.nobody'
+final_status=$?
+
+umount /mnt/xattr
+
+r_checkExitStatus $final_status

iso/empanadas/empanadas/configs/el10.yaml

@@ -16,7 +16,7 @@
     - aarch64
     - ppc64le
     - s390x
-  provide_multilib: True
+  provide_multilib: False
   project_id: 'e7b83c0a-b514-4903-b739-6943bbb307f7'
   repo_symlinks:
     NFV: 'nfv'
@@ -35,6 +35,7 @@
     - 'SAPHANA'
     - 'extras'
     - 'plus'
+  extra_repos: []
   structure:
     packages: 'os/Packages'
     repodata: 'os/repodata'
@@ -65,15 +66,14 @@
           - 'AppStream'
     lorax:
       noupgrade: False
+      squashfs_only: True
       repos:
         - 'BaseOS'
         - 'AppStream'
       variant: 'BaseOS'
-      lorax_removes:
-        - 'libreport-rhel-anaconda-bugzilla'
+      lorax_removes: []
       required_pkgs:
         - 'lorax'
-        - 'genisoimage'
         - 'isomd5sum'
         - 'lorax-templates-rhel'
         - 'lorax-templates-generic'
@@ -84,26 +84,59 @@
         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, UBI]
+        variants: [Base, Minimal, Toolbox, UBI]
+        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: 'r10'
     ksentry:
@@ -121,10 +154,21 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r10'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r10/'
+  kiwimap:
+    git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
+    branch: 'r9'
+    required_pkgs:
+      - dracut-kiwi-live
+      - git
+      - kiwi
+      - kiwi-cli
+      - kiwi-systemdeps-bootloaders
+      - kiwi-systemdeps-containers
+      - kiwi-systemdeps-core
+      - kiwi-systemdeps-disk-images
+      - kiwi-systemdeps-filesystems
+      - kiwi-systemdeps-image-validation
+      - kiwi-systemdeps-iso-media
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'

iso/empanadas/empanadas/configs/el10lh.yaml

@@ -16,7 +16,7 @@
     - aarch64
     - ppc64le
     - s390x
-  provide_multilib: True
+  provide_multilib: False
   project_id: 'e7b83c0a-b514-4903-b739-6943bbb307f7'
   repo_symlinks:
     NFV: 'nfv'
@@ -35,6 +35,7 @@
     - 'SAPHANA'
     - 'extras'
     - 'plus'
+  extra_repos: []
   structure:
     packages: 'os/Packages'
     repodata: 'os/repodata'
@@ -65,15 +66,14 @@
           - 'AppStream'
     lorax:
       noupgrade: False
+      squashfs_only: True
       repos:
         - 'BaseOS'
         - 'AppStream'
       variant: 'BaseOS'
-      lorax_removes:
-        - 'libreport-rhel-anaconda-bugzilla'
+      lorax_removes: []
       required_pkgs:
         - 'lorax'
-        - 'genisoimage'
         - 'isomd5sum'
         - 'lorax-templates-rhel'
         - 'lorax-templates-generic'
@@ -84,26 +84,59 @@
         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, UBI]
+        variants: [Base, Minimal, Toolbox, UBI]
+        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: 'r10'
     ksentry:
@@ -121,10 +154,21 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r10s'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r10s/'
+  kiwimap:
+    git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
+    branch: 'r9'
+    required_pkgs:
+      - dracut-kiwi-live
+      - git
+      - kiwi
+      - kiwi-cli
+      - kiwi-systemdeps-bootloaders
+      - kiwi-systemdeps-containers
+      - kiwi-systemdeps-core
+      - kiwi-systemdeps-disk-images
+      - kiwi-systemdeps-filesystems
+      - kiwi-systemdeps-image-validation
+      - kiwi-systemdeps-iso-media
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'

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

@@ -108,10 +108,6 @@
       - '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'

iso/empanadas/empanadas/configs/el8.yaml

@@ -113,10 +113,6 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r8'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r8/'
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'

iso/empanadas/empanadas/configs/el8lh.yaml

@@ -108,10 +108,6 @@
       - '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'

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

@@ -1,10 +1,10 @@
 ---
 '9-beta':
-  fullname: 'Rocky Linux 9.3'
-  revision: '9.3'
+  fullname: 'Rocky Linux 9.4'
+  revision: '9.4'
   rclvl: 'BETA1'
   major: '9'
-  minor: '3'
+  minor: '4'
   profile: '9-beta'
   disttag: 'el9'
   code: "Blue Onyx"
@@ -17,7 +17,7 @@
     - ppc64le
     - s390x
   provide_multilib: True
-  project_id: '6202c09e-6252-4d3a-bcd3-9c7751682970'
+  project_id: 'df5bcbfc-ba83-4da8-84d6-ae0168921b4d'
   repo_symlinks:
     NFV: 'nfv'
   renames:
@@ -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'
@@ -64,12 +71,13 @@
           - 'BaseOS'
           - 'AppStream'
     lorax:
+      noupgrade: False
+      squashfs_only: True
       repos:
         - 'BaseOS'
         - 'AppStream'
       variant: 'BaseOS'
-      lorax_removes:
-        - 'libreport-rhel-anaconda-bugzilla'
+      lorax_removes: []
       required_pkgs:
         - 'lorax'
         - 'genisoimage'
@@ -83,28 +91,61 @@
         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, UBI]
+        variants: [Base, Minimal, Toolbox, UBI]
+        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: 'r9-beta'
+    branch: 'r9'
     ksentry:
       Workstation: rocky-live-workstation.ks
       Workstation-Lite: rocky-live-workstation-lite.ks
@@ -120,10 +161,21 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r9-beta'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r9-beta/'
+  kiwimap:
+    git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
+    branch: 'r9'
+    required_pkgs:
+      - dracut-kiwi-live
+      - git
+      - kiwi
+      - kiwi-cli
+      - kiwi-systemdeps-bootloaders
+      - kiwi-systemdeps-containers
+      - kiwi-systemdeps-core
+      - kiwi-systemdeps-disk-images
+      - kiwi-systemdeps-filesystems
+      - kiwi-systemdeps-image-validation
+      - kiwi-systemdeps-iso-media
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'
@@ -161,7 +213,7 @@
   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/r9/'
-    branch: 'r9'
+    branch: 'r9-beta'
     gpg:
       stable: 'SOURCES/RPM-GPG-KEY-Rocky-9'
       testing: 'SOURCES/RPM-GPG-KEY-Rocky-9-Testing'

iso/empanadas/empanadas/configs/el9.yaml

@@ -1,10 +1,10 @@
 ---
 '9':
-  fullname: 'Rocky Linux 9.3'
-  revision: '9.3'
+  fullname: 'Rocky Linux 9.4'
+  revision: '9.4'
   rclvl: 'RC1'
   major: '9'
-  minor: '3'
+  minor: '4'
   profile: '9'
   disttag: 'el9'
   code: "Blue Onyx"
@@ -17,7 +17,7 @@
     - ppc64le
     - s390x
   provide_multilib: True
-  project_id: '6202c09e-6252-4d3a-bcd3-9c7751682970'
+  project_id: 'df5bcbfc-ba83-4da8-84d6-ae0168921b4d'
   repo_symlinks:
     NFV: 'nfv'
   renames:
@@ -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'
@@ -64,12 +71,13 @@
           - 'BaseOS'
           - 'AppStream'
     lorax:
+      noupgrade: False
+      squashfs_only: True
       repos:
         - 'BaseOS'
         - 'AppStream'
       variant: 'BaseOS'
-      lorax_removes:
-        - 'libreport-rhel-anaconda-bugzilla'
+      lorax_removes: []
       required_pkgs:
         - 'lorax'
         - 'genisoimage'
@@ -83,26 +91,59 @@
         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, UBI]
+        variants: [Base, Minimal, Toolbox, UBI]
+        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: 'r9'
     ksentry:
@@ -120,10 +161,21 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
+  kiwimap:
+    git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
     branch: 'r9'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r9/'
+    required_pkgs:
+      - dracut-kiwi-live
+      - git
+      - kiwi
+      - kiwi-cli
+      - kiwi-systemdeps-bootloaders
+      - kiwi-systemdeps-containers
+      - kiwi-systemdeps-core
+      - kiwi-systemdeps-disk-images
+      - kiwi-systemdeps-filesystems
+      - kiwi-systemdeps-image-validation
+      - kiwi-systemdeps-iso-media
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'

iso/empanadas/empanadas/configs/el9lh.yaml

@@ -1,10 +1,10 @@
 ---
 '9-lookahead':
-  fullname: 'Rocky Linux 9.4'
-  revision: '9.4'
+  fullname: 'Rocky Linux 9.5'
+  revision: '9.5'
   rclvl: 'LH1'
   major: '9'
-  minor: '4'
+  minor: '5'
   profile: '9-lookahead'
   disttag: 'el9'
   code: "Blue Onyx"
@@ -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'
@@ -64,12 +71,13 @@
           - 'BaseOS'
           - 'AppStream'
     lorax:
+      noupgrade: False
+      squashfs_only: True
       repos:
         - 'BaseOS'
         - 'AppStream'
       variant: 'BaseOS'
-      lorax_removes:
-        - 'libreport-rhel-anaconda-bugzilla'
+      lorax_removes: []
       required_pkgs:
         - 'lorax'
         - 'genisoimage'
@@ -83,26 +91,59 @@
         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, UBI]
+        variants: [Base, Minimal, Toolbox, UBI]
+        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: 'r9'
     ksentry:
@@ -120,10 +161,21 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r9s'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r9s/'
+  kiwimap:
+    git_repo: 'https://git.resf.org/sig_core/rocky-kiwi-descriptions.git'
+    branch: 'r9'
+    required_pkgs:
+      - dracut-kiwi-live
+      - git
+      - kiwi
+      - kiwi-cli
+      - kiwi-systemdeps-bootloaders
+      - kiwi-systemdeps-containers
+      - kiwi-systemdeps-core
+      - kiwi-systemdeps-disk-images
+      - kiwi-systemdeps-filesystems
+      - kiwi-systemdeps-image-validation
+      - kiwi-systemdeps-iso-media
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'

iso/empanadas/empanadas/configs/rln.yaml

@@ -121,10 +121,6 @@
       - 'vim-minimal'
       - 'pykickstart'
       - 'git'
-  variantmap:
-    git_repo: 'https://git.rockylinux.org/rocky/pungi-rocky.git'
-    branch: 'r10'
-    git_raw_path: 'https://git.rockylinux.org/rocky/pungi-rocky/-/raw/r10/'
   repoclosure_map:
     arches:
       x86_64: '--forcearch=x86_64 --arch=x86_64 --arch=athlon --arch=i686 --arch=i586 --arch=i486 --arch=i386 --arch=noarch'

iso/empanadas/empanadas/scripts/build_iso_live.py

@@ -18,6 +18,8 @@ parser.add_argument('--live-iso-mode', type=str, default='local')
 parser.add_argument('--hashed', action='store_true')
 parser.add_argument('--just-copy-it', action='store_true', help="Just copy the images to the compose dir")
 parser.add_argument('--force-build', action='store_true', help="Just build and overwrite the images")
+parser.add_argument('--builder', type=str, help="Choose a builder type and override the set value in the configs")
+parser.add_argument('--increment', type=str, help="Changes the default increment of 0 to a number of your choice")
 results = parser.parse_args()
 rlvars = rldict[results.release]
 major = rlvars['major']
@@ -34,6 +36,8 @@ a = LiveBuild(
         hashed=results.hashed,
         justcopyit=results.just_copy_it,
         force_build=results.force_build,
+        builder=results.builder,
+        image_increment=results.increment,
         logger=results.logger
 )
 

iso/empanadas/empanadas/scripts/launch_builds.py

@@ -16,6 +16,7 @@ parser.add_argument('--rc', action='store_true', help="Release Candidate, Beta,
 results = parser.parse_args()
 rlvars = rldict[results.release]
 major = rlvars['major']
+minor = rlvars['minor']
 
 EXTARCH=["s390x", "ppc64le"]
 EKSARCH=["amd64", "arm64"]
@@ -31,16 +32,18 @@ def run():
     elif results.env == "all":
         arches = EKSARCH+EXTARCH
 
-    command = ["build-iso", "--release", f"{results.release}", "--isolation", "simple", "--hashed"]
+    command = ["build-iso", "--release", f"{results.release}", "--isolation", "simple"]
     if results.rc:
         command += ["--rc"]
+    else:
+        command += ["--hashed"]
 
     buildstamp = datetime.datetime.utcnow()
 
     out = ""
     for architecture in arches:
         copy_command = (f"aws s3 cp --recursive --exclude=* --include=lorax* "
-                            f"/var/lib/mock/rocky-{ major }-$(uname -m)/root/builddir/ "
+                            f"/var/lib/mock/rocky-{ major }.{ minor }-$(uname -m)/root/builddir/ "
                             f"s3://resf-empanadas/buildiso-{ major }-{ architecture }/{ buildstamp.strftime('%s') }/"
         )
         out += job_template.render(
@@ -52,6 +55,7 @@ def run():
             jobname="buildiso",
             namespace="empanadas",
             major=major,
+            minor=minor,
             restartPolicy="Never",
         )
 

iso/empanadas/empanadas/sig/kernel.yaml

@@ -9,6 +9,10 @@ kernel:
         allowed_arches:
           - aarch64
           - x86_64
+      kernel-drivers:
+        allowed_arches:
+          - aarch64
+          - x86_64
       kernel-mainline:
         allowed_arches:
           - aarch64
@@ -32,6 +36,12 @@ kernel:
           - x86_64
           - ppc64le
           - s390x
+      kernel-drivers:
+        allowed_arches:
+          - aarch64
+          - x86_64
+          - ppc64le
+          - s390x
       kernel-mainline:
         allowed_arches:
           - aarch64

iso/empanadas/empanadas/templates/ISOREADME.tmpl

@@ -4,6 +4,7 @@ that match the given ISO. You will see the following formats:
 
 * Rocky-X.Y-ARCH-TYPE       (ISO File)
 * Rocky-X.Y-DATE-ARCH-TYPE  (ISO File)
+* Rocky-X-latest-ARCH-TYPE  (Symlink)
 * Rocky-ARCH-TYPE           (Symlink)
 
 X will be the major release.
@@ -18,19 +19,15 @@ The second format is in the case of rebuilt ISO's, in the case of addressing
 a bug or providing an updated image (eg for a newer kernel, a newer secure
 boot shim, and so on).
 
-The third format in the list is a symlink to the "latest" ISO. Currently, this
-is not advertised on the main site, but there may be potential for this in
-the future as a value add.
+The third format is also in the case of a rebuilt ISO. This will always point
+to the absolute latest ISO of its type. This is used for osinfo and may be
+used on our main website. This serves as a predictable method to download
+the latest ISO whether from curl/wget or using libvirt that relies on osinfo
+to provide the download URL.
 
-This is "unversioned" ISO symlink is for these cases:
-
-* A pre-determined download location for users/mirrors/service providers who
-  want an always available and deterministic download location, which can be
-  easier to script
-
-* osinfo database / libvirt use where if a user selects Rocky Linux X, it
-  should be aware of and be able to download from that location. This should
-  be fully supported in Rocky Linux 8.7 and 9.1, and future Fedora versions.
+The fourth format in the list is a symlink to the "latest" ISO. This was
+originally used as part of osinfo and has been carried over for backwards
+compatibility reasons.
 
 If you have any questions, please reach out to us:
 

iso/empanadas/empanadas/templates/buildImage.tmpl.sh

@@ -24,6 +24,9 @@ lorax --product="${PRODUCT}" \
 {%- for repo in repos %}
   --source={{ repo.url }} \
 {%- endfor %}
+{%- if squashfs_only %}
+  --squashfs-only \
+{%- endif %}
   --bugurl="${BUGURL}" \
   --variant="${VARIANT}" \
   --nomacboot \

iso/empanadas/empanadas/templates/kube/Job.tmpl

@@ -53,6 +53,8 @@ spec:
         key: peridot.rockylinux.org/workflow-tolerates-arch
         operator: Equal
         value: {{ architecture }}
+      nodeSelector:
+        kubernetes.io/arch: {{ architecture }}
       restartPolicy: {{ restartPolicy }}
       volumes:
       - name: resolv-conf

iso/empanadas/empanadas/templates/minimal/9/aarch64

@@ -30,9 +30,13 @@ libblockdev-utils
 libbytesize
 libgcab1
 libjcat
+libsss_autofs
 libudisks2
 libxmlb
 mokutil
+python3-lxml
 shim-aa64
+sssd-nfs-idmap
 udisks2
 volume_key-libs
+NetworkManager-wifi

iso/empanadas/empanadas/templates/minimal/9/ppc64le

@@ -27,7 +27,11 @@ libblockdev-utils
 libbytesize
 libgcab1
 libjcat
+libsss_autofs
 libudisks2
 libxmlb
+python3-lxml
+sssd-nfs-idmap
 udisks2
 volume_key-libs
+NetworkManager-wifi

iso/empanadas/empanadas/templates/minimal/9/s390x

@@ -23,7 +23,11 @@ libblockdev-utils
 libbytesize
 libgcab1
 libjcat
+libsss_autofs
 libudisks2
 libxmlb
+python3-lxml
+sssd-nfs-idmap
 udisks2
 volume_key-libs
+NetworkManager-wifi

iso/empanadas/empanadas/templates/minimal/9/x86_64

@@ -31,9 +31,13 @@ libbytesize
 libgcab1
 libjcat
 libsmbios
+libsss_autofs
 libudisks2
 libxmlb
 mokutil
+python3-lxml
 shim-x64
+sssd-nfs-idmap
 udisks2
 volume_key-libs
+NetworkManager-wifi

iso/empanadas/empanadas/util/iso_utils.py

@@ -118,6 +118,7 @@ class IsoBuild:
         self.bugurl = rlvars['bugurl']
 
         self.extra_files = rlvars['extra_files']
+        self.translators = config['translators']
 
         self.container = config['container']
         if 'container' in rlvars and len(rlvars['container']) > 0:
@@ -308,6 +309,7 @@ class IsoBuild:
                 builddir=self.mock_work_root,
                 lorax_work_root=self.lorax_result_root,
                 bugurl=self.bugurl,
+                squashfs_only=self.iso_map['lorax']['squashfs_only'],
         )
 
         with open(mock_iso_path, "w+") as mock_iso_entry:
@@ -359,6 +361,8 @@ class IsoBuild:
                     self.arches,
                     'tar.gz',
                     'lorax',
+                    'buildiso',
+                    self.translators,
                     self.log
             )
         else:
@@ -1358,6 +1362,8 @@ class IsoBuild:
                             arches_to_unpack,
                             formattype,
                             variantname,
+                            'buildimage',
+                            self.translators,
                             self.log
                     )
 
@@ -1547,6 +1553,7 @@ class LiveBuild:
             updated_image: bool = False,
             image_increment: str = '0',
             peridot: bool = False,
+            builder: str = 'default',
             logger=None
     ):
 
@@ -1576,6 +1583,16 @@ class LiveBuild:
         self.hashed = hashed
         self.peridot = peridot
 
+        # determine builder to use. if a config doesn't have it set, assume
+        # lorax, the default option.
+        if rlvars['livemap']['builder']:
+            self.livebuilder = rlvars['livemap']['builder']
+        else:
+            self.livebuilder = "lorax"
+
+        if builder == "default":
+            self.livebuilder = builder
+
         # Relevant major version items
         self.arch = config['arch']
         self.arches = rlvars['allowed_arches']
@@ -1659,8 +1676,7 @@ class LiveBuild:
 
     def run_build_live_iso(self):
         """
-        Builds DVD images based on the data created from the initial lorax on
-        each arch. This should NOT be called during the usual run() section.
+        Builds live images based on the data provided at init.
         """
         sync_root = self.compose_latest_sync
 
@@ -1671,6 +1687,15 @@ class LiveBuild:
             self.log.error(Color.FAIL + 'Running an unsupported architecture.')
             raise SystemExit()
 
+        if self.image not in self.livemap['ksentry'].keys():
+            self.log.error(Color.FAIL + 'Trying to build an unknown live image type.')
+            raise SystemExit()
+
+        # Check that the builder is lorax, we don't support anything else yet
+        if self.livebuilder != "lorax":
+            self.log.error(Color.FAIL + 'Attempting to use an unsupported builder.')
+            raise SystemExit()
+
         self._live_iso_build_wrap()
 
         self.log.info('Compose repo directory: %s' % sync_root)
@@ -1858,7 +1883,7 @@ class LiveBuild:
 
         print(entry_name_list, cmd, entries_dir)
         for pod in entry_name_list:
-            podman_cmd_entry = '{} run -d -it -v "{}:{}" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format(
+            podman_cmd_entry = '{} run --privileged -d -it -v "{}:{}" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format(
                     cmd,
                     self.compose_root,
                     self.compose_root,

iso/empanadas/empanadas/util/shared.py

@@ -607,7 +607,8 @@ class Shared:
 
     # pylint: disable=too-many-locals,too-many-arguments
     @staticmethod
-    def s3_determine_latest(s3_bucket, release, arches, filetype, name, logger):
+    def s3_determine_latest(s3_bucket, release, arches, filetype, name,
+                            root_prefix, translators, logger):
         """
         Using native s3, determine the latest artifacts and return a dict
         """
@@ -640,8 +641,15 @@ class Shared:
 
         for arch in arches:
             temps = []
+            new_arch = arch
+            new_release = release
+            # This is lazy, but...
+            if root_prefix == 'buildiso':
+                new_arch = translators[arch]
+                new_release = release.split('.')[0]
+            start_of_path = f"{root_prefix}-{new_release}-{new_arch}"
             for y in temp:
-                if arch in y:
+                if arch in y and y.startswith(start_of_path):
                     temps.append(y)
             temps.sort(reverse=True)
             if len(temps) > 0:

mangle/generators/common_9

@@ -8,9 +8,9 @@ VER="r${MAJOR}${LH}"
 
 case "$VER" in
   r9)
-    export PERIDOT_PROJECT_ID=dff20351-7d36-4f7c-9eea-7f039f5026d0 ;;
+    export PERIDOT_PROJECT_ID=df5bcbfc-ba83-4da8-84d6-ae0168921b4d ;;
   r9s)
-    export PERIDOT_PROJECT_ID=6202c09e-6252-4d3a-bcd3-9c7751682970 ;;
+    export PERIDOT_PROJECT_ID=df5bcbfc-ba83-4da8-84d6-ae0168921b4d ;;
   *)
     echo "Not supported"
     exit 1

mangle/generators/oval.sh

@@ -10,7 +10,10 @@ TEMP="$(mktemp -d)"
 for version in 8 9; do
   file="$TEMP/org.rockylinux.rlsa-$version.xml"
   log "Generating $file"
-  podman run --rm --storage-opt ignore_chown_errors=true ghcr.io/rocky-linux/oval:latest -- $version > "$file"
+  #podman run --rm --storage-opt ignore_chown_errors=true ghcr.io/rocky-linux/oval:latest -- $version > "$file"
+  # The above reports an error when running on R8. The below may *not* work on anything else.
+  # TODO: verify this is the case.
+  podman run --rm --storage-opt ignore_chown_errors=true ghcr.io/rocky-linux/oval:latest $version > "$file"
   log "Compressing $file to $file.bz"
   bzip2 -kfz "$file"
 done

mangle/generators/prepopulate_parser.py

@@ -10,6 +10,7 @@ from common import *
 # Source packages we do not ship or are rocky branded
 IGNORES = [
         'insights-client',
+        'lorax-templates-rhel',
         'redhat-cloud-client-configuration',
         'rhc',
         'rhc-worker-playbook',

mangle/mock/rl10/rl10-aarch64.cfg

@@ -0,0 +1,86 @@
+# Generated peridot mock config
+config_opts['root'] = 'rocky-10-aarch64'
+config_opts['target_arch'] = 'noarch'
+config_opts['legal_host_arches'] = ['aarch64','noarch']
+config_opts['chroot_setup_cmd'] = 'install bash glibc-minimal-langpack gnupg2 rpm-build shadow-utils system-release redhat-rpm-config'
+config_opts['dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}'
+config_opts['releasever'] = '10'
+config_opts['package_manager'] = 'dnf'
+config_opts['extra_chroot_dirs'] = [ '/run/lock' ]
+config_opts['rpmbuild_command'] = '/usr/bin/rpmbuild'
+config_opts['use_bootstrap_image'] = False
+config_opts['plugin_conf']['rpmautospec_enable'] = True
+config_opts['plugin_conf']['rpmautospec_opts'] = {
+  'requires': ['rpmautospec'],
+  'cmd_base': ['/usr/bin/rpmautospec', 'process-distgit'],
+}
+
+
+config_opts['plugin_conf']['ccache_enable'] = False
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['plugin_conf']['yum_cache_enable'] = False
+config_opts['rpmbuild_networking'] = True
+config_opts['use_host_resolv'] = True
+config_opts['print_main_output'] = True
+
+config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
+config_opts['macros']['%_host'] = 'aarch64-redhat-linux-gnu'
+config_opts['macros']['%_host_cpu'] = 'aarch64'
+config_opts['macros']['%_vendor'] = "redhat"
+config_opts['macros']['%_vendor_host'] = "redhat"
+
+config_opts['module_setup_commands'] = []
+
+config_opts['macros']['%__bootstrap'] = '~bootstrap'
+config_opts['macros']['%vendor'] = 'Rocky Enterprise Software Foundation'
+config_opts['macros']['%packager'] = 'Rocky Linux Build System (Peridot) <releng@rockylinux.org>'
+config_opts['macros']['%distribution'] = 'Rocky Linux 10.0'
+config_opts['macros']['%dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}'
+config_opts['macros']['%rhel'] = '10'
+config_opts['files']['usr/lib/rpm/macros.d/macros.dist'] = """
+%__bootstrap ~bootstrap
+%vendor Rocky Enterprise Software Foundation
+%packager Rocky Linux Build System (Peridot) <releng@rockylinux.org>
+%distribution Rocky Linux 10
+%dist %{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}
+%rhel 10
+
+"""
+
+
+config_opts['dnf.conf'] = """
+[main]
+debuglevel=1
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+keepcache=1
+best=1
+syslog_ident=peridotbuilder
+syslog_device=
+metadata_expire=0
+install_weak_deps=0
+protected_packages=
+reposdir=/dev/null
+logfile=/var/log/yum.log
+mdpolicy=group:primary
+metadata_expire=0
+user_agent=peridotbuilder
+module_platform_id=platform:el10
+[yumrepofs_0]
+name=Peridot Internal - Yumrepofs 0
+baseurl=https://yumrepofs.build.resf.org/v1/projects/e7b83c0a-b514-4903-b739-6943bbb307f7/repo/all/$arch
+gpgcheck=0
+enabled=1
+priority=0
+module_hotfixes=0
+skip_if_unavailable=1
+[peridotexternal_0]
+name=Peridot External 0
+baseurl=https://bootstrap9.releng.rockylinux.org/repos_stage1/10.0-BETA/10.0-BETA-bootstrap_$arch/
+gpgcheck=0
+enabled=1
+priority=80
+module_hotfixes=0
+"""

mangle/mock/rl10/rl10-ppc64le.cfg

@@ -0,0 +1,86 @@
+# Generated peridot mock config
+config_opts['root'] = 'rocky-10-ppc64le'
+config_opts['target_arch'] = 'noarch'
+config_opts['legal_host_arches'] = ['ppc64le','noarch']
+config_opts['chroot_setup_cmd'] = 'install bash glibc-minimal-langpack gnupg2 rpm-build shadow-utils system-release redhat-rpm-config'
+config_opts['dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}'
+config_opts['releasever'] = '10'
+config_opts['package_manager'] = 'dnf'
+config_opts['extra_chroot_dirs'] = [ '/run/lock' ]
+config_opts['rpmbuild_command'] = '/usr/bin/rpmbuild'
+config_opts['use_bootstrap_image'] = False
+config_opts['plugin_conf']['rpmautospec_enable'] = True
+config_opts['plugin_conf']['rpmautospec_opts'] = {
+  'requires': ['rpmautospec'],
+  'cmd_base': ['/usr/bin/rpmautospec', 'process-distgit'],
+}
+
+
+config_opts['plugin_conf']['ccache_enable'] = False
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['plugin_conf']['yum_cache_enable'] = False
+config_opts['rpmbuild_networking'] = True
+config_opts['use_host_resolv'] = True
+config_opts['print_main_output'] = True
+
+config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
+config_opts['macros']['%_host'] = 'ppc64le-redhat-linux-gnu'
+config_opts['macros']['%_host_cpu'] = 'ppc64le'
+config_opts['macros']['%_vendor'] = "redhat"
+config_opts['macros']['%_vendor_host'] = "redhat"
+
+config_opts['module_setup_commands'] = []
+
+config_opts['macros']['%__bootstrap'] = '~bootstrap'
+config_opts['macros']['%vendor'] = 'Rocky Enterprise Software Foundation'
+config_opts['macros']['%packager'] = 'Rocky Linux Build System (Peridot) <releng@rockylinux.org>'
+config_opts['macros']['%distribution'] = 'Rocky Linux 10.0'
+config_opts['macros']['%dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}'
+config_opts['macros']['%rhel'] = '10'
+config_opts['files']['usr/lib/rpm/macros.d/macros.dist'] = """
+%__bootstrap ~bootstrap
+%vendor Rocky Enterprise Software Foundation
+%packager Rocky Linux Build System (Peridot) <releng@rockylinux.org>
+%distribution Rocky Linux 10
+%dist %{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}
+%rhel 10
+
+"""
+
+
+config_opts['dnf.conf'] = """
+[main]
+debuglevel=1
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+keepcache=1
+best=1
+syslog_ident=peridotbuilder
+syslog_device=
+metadata_expire=0
+install_weak_deps=0
+protected_packages=
+reposdir=/dev/null
+logfile=/var/log/yum.log
+mdpolicy=group:primary
+metadata_expire=0
+user_agent=peridotbuilder
+module_platform_id=platform:el10
+[yumrepofs_0]
+name=Peridot Internal - Yumrepofs 0
+baseurl=https://yumrepofs.build.resf.org/v1/projects/e7b83c0a-b514-4903-b739-6943bbb307f7/repo/all/$arch
+gpgcheck=0
+enabled=1
+priority=0
+module_hotfixes=0
+skip_if_unavailable=1
+[peridotexternal_0]
+name=Peridot External 0
+baseurl=https://bootstrap9.releng.rockylinux.org/repos_stage1/10.0-BETA/10.0-BETA-bootstrap_$arch/
+gpgcheck=0
+enabled=1
+priority=80
+module_hotfixes=0
+"""

mangle/mock/rl10/rl10-s390x.cfg

@@ -0,0 +1,86 @@
+# Generated peridot mock config
+config_opts['root'] = 'rocky-10-s390x'
+config_opts['target_arch'] = 'noarch'
+config_opts['legal_host_arches'] = ['s390x','noarch']
+config_opts['chroot_setup_cmd'] = 'install bash glibc-minimal-langpack gnupg2 rpm-build shadow-utils system-release redhat-rpm-config'
+config_opts['dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}'
+config_opts['releasever'] = '10'
+config_opts['package_manager'] = 'dnf'
+config_opts['extra_chroot_dirs'] = [ '/run/lock' ]
+config_opts['rpmbuild_command'] = '/usr/bin/rpmbuild'
+config_opts['use_bootstrap_image'] = False
+config_opts['plugin_conf']['rpmautospec_enable'] = True
+config_opts['plugin_conf']['rpmautospec_opts'] = {
+  'requires': ['rpmautospec'],
+  'cmd_base': ['/usr/bin/rpmautospec', 'process-distgit'],
+}
+
+
+config_opts['plugin_conf']['ccache_enable'] = False
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['plugin_conf']['yum_cache_enable'] = False
+config_opts['rpmbuild_networking'] = True
+config_opts['use_host_resolv'] = True
+config_opts['print_main_output'] = True
+
+config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
+config_opts['macros']['%_host'] = 's390x-redhat-linux-gnu'
+config_opts['macros']['%_host_cpu'] = 's390x'
+config_opts['macros']['%_vendor'] = "redhat"
+config_opts['macros']['%_vendor_host'] = "redhat"
+
+config_opts['module_setup_commands'] = []
+
+config_opts['macros']['%__bootstrap'] = '~bootstrap'
+config_opts['macros']['%vendor'] = 'Rocky Enterprise Software Foundation'
+config_opts['macros']['%packager'] = 'Rocky Linux Build System (Peridot) <releng@rockylinux.org>'
+config_opts['macros']['%distribution'] = 'Rocky Linux 10.0'
+config_opts['macros']['%dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}'
+config_opts['macros']['%rhel'] = '10'
+config_opts['files']['usr/lib/rpm/macros.d/macros.dist'] = """
+%__bootstrap ~bootstrap
+%vendor Rocky Enterprise Software Foundation
+%packager Rocky Linux Build System (Peridot) <releng@rockylinux.org>
+%distribution Rocky Linux 10
+%dist %{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}
+%rhel 10
+
+"""
+
+
+config_opts['dnf.conf'] = """
+[main]
+debuglevel=1
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+keepcache=1
+best=1
+syslog_ident=peridotbuilder
+syslog_device=
+metadata_expire=0
+install_weak_deps=0
+protected_packages=
+reposdir=/dev/null
+logfile=/var/log/yum.log
+mdpolicy=group:primary
+metadata_expire=0
+user_agent=peridotbuilder
+module_platform_id=platform:el10
+[yumrepofs_0]
+name=Peridot Internal - Yumrepofs 0
+baseurl=https://yumrepofs.build.resf.org/v1/projects/e7b83c0a-b514-4903-b739-6943bbb307f7/repo/all/$arch
+gpgcheck=0
+enabled=1
+priority=0
+module_hotfixes=0
+skip_if_unavailable=1
+[peridotexternal_0]
+name=Peridot External 0
+baseurl=https://bootstrap9.releng.rockylinux.org/repos_stage1/10.0-BETA/10.0-BETA-bootstrap_$arch/
+gpgcheck=0
+enabled=1
+priority=80
+module_hotfixes=0
+"""

mangle/mock/rl10/rl10-x86_64.cfg

@@ -0,0 +1,86 @@
+# Generated peridot mock config
+config_opts['root'] = 'rocky-10-x86_64'
+config_opts['target_arch'] = 'noarch'
+config_opts['legal_host_arches'] = ['x86_64','noarch']
+config_opts['chroot_setup_cmd'] = 'install bash glibc-minimal-langpack gnupg2 rpm-build shadow-utils system-release redhat-rpm-config'
+config_opts['dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}'
+config_opts['releasever'] = '10'
+config_opts['package_manager'] = 'dnf'
+config_opts['extra_chroot_dirs'] = [ '/run/lock' ]
+config_opts['rpmbuild_command'] = '/usr/bin/rpmbuild'
+config_opts['use_bootstrap_image'] = False
+config_opts['plugin_conf']['rpmautospec_enable'] = True
+config_opts['plugin_conf']['rpmautospec_opts'] = {
+  'requires': ['rpmautospec'],
+  'cmd_base': ['/usr/bin/rpmautospec', 'process-distgit'],
+}
+
+
+config_opts['plugin_conf']['ccache_enable'] = False
+config_opts['plugin_conf']['root_cache_enable'] = False
+config_opts['plugin_conf']['yum_cache_enable'] = False
+config_opts['rpmbuild_networking'] = True
+config_opts['use_host_resolv'] = True
+config_opts['print_main_output'] = True
+
+config_opts['macros']['%_rpmfilename'] = '%%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm'
+config_opts['macros']['%_host'] = 'x86_64-redhat-linux-gnu'
+config_opts['macros']['%_host_cpu'] = 'x86_64'
+config_opts['macros']['%_vendor'] = "redhat"
+config_opts['macros']['%_vendor_host'] = "redhat"
+
+config_opts['module_setup_commands'] = []
+
+config_opts['macros']['%__bootstrap'] = '~bootstrap'
+config_opts['macros']['%vendor'] = 'Rocky Enterprise Software Foundation'
+config_opts['macros']['%packager'] = 'Rocky Linux Build System (Peridot) <releng@rockylinux.org>'
+config_opts['macros']['%distribution'] = 'Rocky Linux 10.0'
+config_opts['macros']['%dist'] = '%{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}'
+config_opts['macros']['%rhel'] = '10'
+config_opts['files']['usr/lib/rpm/macros.d/macros.dist'] = """
+%__bootstrap ~bootstrap
+%vendor Rocky Enterprise Software Foundation
+%packager Rocky Linux Build System (Peridot) <releng@rockylinux.org>
+%distribution Rocky Linux 10
+%dist %{!?distprefix0:%{?distprefix}}%{expand:%{lua:for i=0,9999 do print("%{?distprefix" .. i .."}") end}}.el10%{?with_bootstrap:~bootstrap}
+%rhel 10
+
+"""
+
+
+config_opts['dnf.conf'] = """
+[main]
+debuglevel=1
+retries=20
+obsoletes=1
+gpgcheck=0
+assumeyes=1
+keepcache=1
+best=1
+syslog_ident=peridotbuilder
+syslog_device=
+metadata_expire=0
+install_weak_deps=0
+protected_packages=
+reposdir=/dev/null
+logfile=/var/log/yum.log
+mdpolicy=group:primary
+metadata_expire=0
+user_agent=peridotbuilder
+module_platform_id=platform:el10
+[yumrepofs_0]
+name=Peridot Internal - Yumrepofs 0
+baseurl=https://yumrepofs.build.resf.org/v1/projects/e7b83c0a-b514-4903-b739-6943bbb307f7/repo/all/$arch
+gpgcheck=0
+enabled=1
+priority=0
+module_hotfixes=0
+skip_if_unavailable=1
+[peridotexternal_0]
+name=Peridot External 0
+baseurl=https://bootstrap9.releng.rockylinux.org/repos_stage1/10.0-BETA/10.0-BETA-bootstrap_$arch/
+gpgcheck=0
+enabled=1
+priority=80
+module_hotfixes=0
+"""

mangle/rlutil.py

@@ -33,7 +33,7 @@ command = parser.parse_args().cmd
 
 def all_rocky_files(
         directory_path = '/etc/yum.repos.d',
-        filter_filename = lambda file: 'rocky' in file) -> list:
+        filter_filename = lambda file: 'rocky' in file.lower()) -> list:
     """
     Filter out specified files
     """

sync/common

@@ -67,7 +67,7 @@ REV="${REVISION}${APPEND_TO_DIR}"
 
 # Used to iterate over ISOs?
 # Override: Allowed
-VARIANTS=(boot minimal dvd1)
+VARIANTS=(boot minimal dvd1 dvd)
 
 # Syncing functions
 function parallel_rsync_no_delete_staging() {

sync/common_9

@@ -3,19 +3,19 @@
 # Revision must always start with a major number
 case "${RLREL}" in
   stable)
-    REVISION=9.3
-    PREREV=9.2
+    REVISION=9.4
+    PREREV=9.3
     APPEND_TO_DIR="-RC1"
     ;;
   beta)
-    REVISION=9.4
-    PREREV=9.3
+    REVISION=9.5
+    PREREV=9.4
     APPEND_TO_DIR="-beta"
     COMPOSE_APPEND="-beta"
     ;;
   lh)
-    REVISION=9.4
-    PREREV=9.3
+    REVISION=9.5
+    PREREV=9.4
     APPEND_TO_DIR="-lookahead"
     COMPOSE_APPEND="-lookahead"
     ;;

sync/gen-torrents.sh

@@ -63,7 +63,7 @@ for variant in "${VARIANTS[@]}"; do
 
         printf "** Linking Version: %s; Arch: %s; Variant: %s\n" "${REVISION}" "${arch}" "${variant}"
         ln -sv \
-            "${ISODIR}"/"${arch}"/{CHECKSUM*,"${name_template}".iso*} \
+            "${ISODIR}"/"${arch}"/{"CHECKSUM"*,"${name_template}".iso*} \
             "${name_template}"/
     done
 done

sync/latest-images/main.go

@@ -63,7 +63,7 @@ func FindRecentImages(bucketName string, prefix string, version string, imageTyp
 		log.Fatalf("uh oh: %v", err)
 	}
 
-	pattern := regexp.MustCompile(`(?P<whole>Rocky-(?P<major>[0-9]+)-(?P<type>\w+)(?:-(?P<variant>\w+))?-(?:[0-9]+)\.(?P<minor>[0-9])-(?P<date>[0-9]+)\.(?P<epoch>[0-9]+)\.(?P<architecture>\w+)/(?P<datestamp>[0-9]+)/(?P<file>(.+\.(?P<extension>(box|qcow2|raw|tar\.xz|vhd)))))$`)
+	pattern := regexp.MustCompile(`(?P<whole>Rocky-(?P<major>[0-9]+)-(?P<type>\w+)(?:-(?P<variant>\w+))?-(?:[0-9]+)\.(?P<minor>[0-9]+)-(?P<date>[0-9]+)\.(?P<epoch>[0-9]+)\.(?P<architecture>\w+)/(?P<datestamp>[0-9]+)/(?P<file>(.+\.(?P<extension>(box|qcow2|raw|tar\.xz|vhd)))))$`)
 	// Loop through the objects and find the latest one for each file type
 	latestByTypeVariant := map[string]map[string]*Image{}
 	for _, obj := range items {