tests: Set release to 41 instead of rawhide

This gets passed to dnf for use in the $releasever substitution for repo
urls, resulting in it using the wrong repos for the test.

.gitignore

@@ -246,3 +246,7 @@
 /lorax-41.1.tar.gz
 /lorax-41.2.tar.gz
 /lorax-41.3.tar.gz
+/lorax-41.4.tar.gz
+/lorax-41.5.tar.gz
+/lorax-41.6.tar.gz
+/lorax-41.7.tar.gz

lorax.spec

@@ -4,7 +4,7 @@
 %global forgeurl https://github.com/weldr/lorax
 
 Name:           lorax
-Version:        41.3
+Version:        41.7
 Release:        2%{?dist}
 Summary:        Tool for creating the anaconda install images
 License:        GPL-2.0-or-later
@@ -171,8 +171,28 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 %{_datadir}/lorax/templates.d/*
 
 %changelog
-* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 41.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+* Mon Nov 25 2024 Brian C. Lane <bcl@redhat.com> - 41.7-2
+- tests: Set release to 41 instead of rawhide (bcl)
+
+* Fri Nov 22 2024 Brian C. Lane <bcl@redhat.com> 41.7-1
+- runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com)
+
+* Tue Oct 08 2024 Brian C. Lane <bcl@redhat.com> 41.6-1
+- tests: Fix mkksiso unit test (bcl@redhat.com)
+- test: Use fedora:41 for test-in-podman (bcl@redhat.com)
+- pylint: Print astroid version (bcl@redhat.com)
+- Extend help for --updates and --ks parameters (jkonecny@redhat.com)
+- Fix --updates the updates image wasn't loaded (jkonecny@redhat.com)
+
+* Mon Sep 30 2024 Brian C. Lane <bcl@redhat.com> 41.5-1
+- templates: Drop dnf install (bcl@redhat.com)
+
+* Mon Sep 09 2024 Brian C. Lane <bcl@redhat.com> 41.4-1
+- New lorax documentation - 41.3 (bcl@redhat.com)
+- ltmpl: Remove * from docstring (bcl@redhat.com)
+- docs: Update intersphinx and add _static dir (bcl@redhat.com)
+- docs: Document --rootfs-type options (bcl@redhat.com)
+- creator: Change rootfs description to match cmdline argument (bcl@redhat.com)
 
 * Tue Jul 16 2024 Brian C. Lane <bcl@redhat.com> 41.3-1
 - Accept but ignore the old --squashfs-only argument (awilliam@redhat.com)

sources

@@ -1 +1 @@
-SHA512 (lorax-41.3.tar.gz) = 35fcbde5490a52c07f2fdc05b04f7d2f7877e33012f3adf654458f5e52ac56b91345b567fd10c95d0dcea33895bc0602b7ba4db6251935f7103322e0461590ff
+SHA512 (lorax-41.7.tar.gz) = 1f6738aa72bc0a1969d12e50c8c1bff225a62f565a62cfa12e8d4cf9c4c119db794d7c49259dd73ef660b73f0512c33d8bc4d86d0072bd67b1c193e0057d4a80

tests/scripts/run_tests.sh

@@ -186,8 +186,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
@@ -197,15 +197,17 @@ function add_updatesimg {
 }
 
 function test_updatesimg {
-    [ -e "$ISODIR/updates/updates.img" ] || fail "Missing file from iso"
+    [ -e "$ISODIR/updates.img" ] || fail "Missing updates.img 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
@@ -224,8 +226,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
@@ -239,8 +241,6 @@ function run_as_user {
     umount_dirs
 }
 
-
-
 # Gather up the list of system repo files and use them for lorax
 REPOS=$(for f in /etc/yum.repos.d/*repo; do echo -n "--repo $f "; done)
 if [ -z "$REPOS" ]; then
@@ -252,7 +252,7 @@ fi
 # Run lorax using the host's repository configuration file
 if [ ! -e "$BOOTISO" ]; then
     running "Build boot.iso with lorax"
-    lorax --product="Fedora" --version=rawhide --release=rawhide --volid="Fedora-rawhide-test" \
+    lorax --product="Fedora" --version=41 --release=41 --volid="Fedora-41-test" \
         $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1
 fi