tests: Set release to 40 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

@@ -242,3 +242,6 @@
 /lorax-40.4.tar.gz
 /lorax-40.5.tar.gz
 /lorax-40.6.tar.gz
+/lorax-40.7.tar.gz
+/lorax-40.8.tar.gz
+/lorax-40.9.tar.gz

lorax.spec

@@ -3,8 +3,8 @@
 %define debug_package %{nil}
 
 Name:           lorax
-Version:        40.6
-Release:        1%{?dist}
+Version:        40.9
+Release:        2%{?dist}
 Summary:        Tool for creating the anaconda install images
 
 License:        GPL-2.0-or-later
@@ -171,6 +171,28 @@ make DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} install
 %{_datadir}/lorax/templates.d/*
 
 %changelog
+* Mon Nov 25 2024 Brian C. Lane <bcl@redhat.com> - 40.9-2
+- tests: Set release to 40 instead of rawhide (bcl)
+
+* Fri Nov 22 2024 Brian C. Lane <bcl@redhat.com> 40.9-1
+- runtime-cleanup: Newer glibc installs into /usr/lib64 (bcl@redhat.com)
+- Prepare for the sbin merge (zbyszek@in.waw.pl)
+
+* Tue Oct 08 2024 Brian C. Lane <bcl@redhat.com> 40.8-1
+- creator: Fix pylint error in run_creator (bcl@redhat.com)
+- tests: Fix mkksiso unit test (bcl@redhat.com)
+- test: Use fedora:40 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)
+- Implement --replace also for S390 (sebastian.stark@advantest.com)
+- mkksiso: option --replace to replace arbitrary text in boot config.  (sebastian.stark@advantest.com)
+- New lorax documentation 40.8 (bcl@redhat.com)
+- docs: Remove links to older branches (bcl@redhat.com)
+
+* Tue Mar 26 2024 Brian C. Lane <bcl@redhat.com> 40.7-1
+- runtime-cleanup: wget2-wget has replaced wget (yselkowi@redhat.com)
+
 * Mon Feb 19 2024 Brian C. Lane <bcl@redhat.com>
 - Add example use of lmc in github actions. (cjshowalter@alaska.edu)
 - Require lorax-templates-rhel when building for ELN, CentOS Stream and RHEL (sgallagh@redhat.com)

sources

@@ -1 +1 @@
-SHA512 (lorax-40.6.tar.gz) = 0548576ae188aa875a7bd0d87e4dda6afe529b859ffe0d9ec380e173b1439c52c45a79b3568f23eef9a10baa13f502aba0bb269f0dcc24e268957e26f93cb577
+SHA512 (lorax-40.9.tar.gz) = 5c4033f3eebd5810a142d631b1a86a81f070e488c1a2c063528d116765f296477f8902803083b97c52509e26c1d31369f5674cecdc674236a742a6e769cc5ec1

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=40 --release=40 --volid="Fedora-40-test" \
         $REPOS --isfinal --nomacboot /var/tmp/lorax-fedora-iso/ || exit 1
 fi