Merge branch 'c10s' into a10s

.gitignore

@@ -249,3 +249,4 @@ lorax-40.5.7
 /lorax-40.5.5.tar.gz
 /lorax-40.5.6.tar.gz
 /lorax-40.5.7.tar.gz
+/lorax-40.5.8.tar.gz

lorax.spec

@@ -3,8 +3,8 @@
 %define debug_package %{nil}
 
 Name:           lorax
-Version:        40.5.7
-Release:        1%{?dist}.alma.1
+Version:        40.5.8
+Release:        3%{?dist}.alma.1
 Summary:        Tool for creating the anaconda install images
 
 License:        GPL-2.0-or-later
@@ -185,9 +185,33 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 %{_datadir}/lorax/templates.d/*
 
 %changelog
-* Fri Sep 13 2024 Eduard Abdullin <eabdullin@almalinux.org> 40.5.7-1.alma.1
+* Tue Dec 10 2024 Eduard Abdullin <eabdullin@almalinux.org> 40.5.8-3.alma.1
 - Add x86_64_v2 support
 
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 40.5.8-3
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Oct 21 2024 Brian C. Lane <bcl@redhat.com> - 40.5.8-2
+- Bump release to rebuild with fixed tests
+  Related: RHEL-61778
+
+* Tue Oct 08 2024 Brian C. Lane <bcl@redhat.com> 40.5.8-1
+- tests: Fix mkksiso unit test (bcl)
+  Related: RHEL-61778
+- pylint: Print astroid version (bcl)
+  Related: RHEL-61778
+- Extend help for --updates and --ks parameters (jkonecny)
+  Related: RHEL-61778
+- Fix --updates the updates image wasn't loaded (jkonecny)
+  Resolves: RHEL-61778
+- Implement --replace also for S390 (sebastian.stark)
+  Related: RHEL-61778
+- mkksiso: option --replace to replace arbitrary text in boot config.  (sebastian.stark)
+  Related: RHEL-61778
+- livemedia: Add isomd5sum (bcl)
+  Resolves: RHEL-58896
+
 * Tue Sep 10 2024 Brian C. Lane <bcl@redhat.com> 40.5.7-1
 - templates: Sync template changes from lorax-templates-rhel (bcl)
   Resolves: RHEL-54713

sources

@@ -1 +1 @@
-SHA512 (lorax-40.5.7.tar.gz) = 7bf36986efd7503b1cb91962d9dc5ff9266a0e74c6897dd917340f7aa5bc444769ac291dbf33d1a9512739784f93c25d857492341821d063dec2947684bdd076
+SHA512 (lorax-40.5.8.tar.gz) = cb045b9ad3f2697c1c29e9157092886a6f02b708a330eae67d49189603026ff6ffb66afde69b402b1a021803f535496a06ff498bb5b21265ec77cab18e1d48d5

tests/scripts/run_tests.sh

@@ -245,8 +245,8 @@ function add_updatesimg {
     running "Add updates.img"
 
     # nothing in the file, just test that it is there
-    touch /tmp/test-updates.img
-    mkksiso -u /tmp/test-updates.img $BOOTISO $OUTISO || exit 1
+    touch /tmp/updates.img
+    mkksiso -u /tmp/updates.img $BOOTISO $OUTISO || exit 1
     mount $OUTISO $ISODIR || exit 1
 
     test_updatesimg
@@ -256,15 +256,18 @@ function add_updatesimg {
 }
 
 function test_updatesimg {
-    [ -e "$ISODIR/updates/updates.img" ] || fail "Missing file from iso"
+    [ -e "$ISODIR/updates.img" ] || fail "Missing file from iso"
+    grep "inst.updates=.*updates.img" "$ISODIR/boot/grub2/grub.cfg" || fail "Missing BIOS grub.cfg inst.updates entry"
+    grep "inst.updates=.*updates.img" "$ISODIR/EFI/BOOT/grub.cfg" || fail "Missing UEFI grub.cfg inst.updates entry"
+
 }
 
 # All of the changes
 function run_all {
     running "Use all the options"
 
-    touch /tmp/test-updates.img
-    mkksiso -u /tmp/test-updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet"  --ks $KS $BOOTISO $OUTISO || exit 1
+    touch /tmp/updates.img
+    mkksiso -u /tmp/updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet"  --ks $KS $BOOTISO $OUTISO || exit 1
     mount $OUTISO $ISODIR || exit 1
 
     test_ks
@@ -283,8 +286,8 @@ function run_as_user {
     running "Use all the options as a user"
 
     [ ! -e "/home/lorax-ted" ] && useradd -m lorax-ted
-    touch /tmp/test-updates.img
-    su - lorax-ted -c "mkksiso --skip-mkefiboot -u /tmp/test-updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1
+    touch /tmp/updates.img
+    su - lorax-ted -c "mkksiso --skip-mkefiboot -u /tmp/updates.img -a /etc/services -V "mkksiso-test" -c "console=ttyS0,115200n8" --rm "quiet" --ks $KS $BOOTISO $OUTISO" || exit 1
     mount $OUTISO $ISODIR || exit 1
 
     test_ks
@@ -303,10 +306,16 @@ if [ ! -e /usr/share/lorax/templates.d/80-rhel/ ]; then
     exit 1
 fi
 
-# Gather up the list of system repo files and use them for lorax
-REPOS=$(find /etc/yum.repos.d/ -maxdepth 1 -type f -name '*\.repo' ! -name 'fedora.repo' -exec echo -n "--repo {} " \;)
+# NOTE: This must be able to run both on the Zuul using centos repos and on osci gating using rhel
+# so filter for the list of allowed repos
+REPODIR="/etc/yum.repos.d"
+REPOFILES="rhel.repo centos.repo test-artifacts.repo"
+REPOS=""
+for r in $REPOFILES; do
+    [ -e "$REPODIR/$r" ] && REPOS+="--repo $REPODIR/$r "
+done
 if [ -z "$REPOS" ]; then
-    echo "No system repos found"
+    echo "No repos ($REPOFILES) found in $REPODIR"
     exit 1
 fi