From 6f0480727f06175fdeaef181e727a98e7b2dc4da Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 28 Jul 2023 15:10:37 -0700 Subject: [PATCH] Make sure live image volume ID isn't longer than 32 chars This can happen now we allow working on multiple Koji tasks. Signed-off-by: Adam Williamson --- tests/_live_build.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/_live_build.pm b/tests/_live_build.pm index bcd79dd7..7669efab 100644 --- a/tests/_live_build.pm +++ b/tests/_live_build.pm @@ -89,8 +89,11 @@ sub run { # now make the image build directory inside the mock root and put the kickstart there assert_script_run 'mock -r openqa --isolation=simple --chroot "mkdir -p /chroot_tmpdir"'; assert_script_run "mock -r openqa --isolation=simple --copyin openqa.ks /chroot_tmpdir"; + # make sure volume ID isn't too long (for multiple Koji task cases) + my $aot28 = substr($advortask, 0, 28); + my $volid = "FWL-${aot28}"; # PULL SOME LEVERS! PULL SOME LEVERS! - assert_script_run "mock -r openqa --enable-network --isolation=simple --chroot \"/sbin/livemedia-creator --ks /chroot_tmpdir/openqa.ks --logfile /chroot_tmpdir/lmc-logs/livemedia-out.log --no-virt --resultdir /chroot_tmpdir/lmc --project Fedora-${subv}-Live --make-iso --volid FWL-${advortask} --iso-only --iso-name Fedora-${subv}-Live-${arch}-${advortask}.iso --releasever ${releasever} --macboot\"", 7200; + assert_script_run "mock -r openqa --enable-network --isolation=simple --chroot \"/sbin/livemedia-creator --ks /chroot_tmpdir/openqa.ks --logfile /chroot_tmpdir/lmc-logs/livemedia-out.log --no-virt --resultdir /chroot_tmpdir/lmc --project Fedora-${subv}-Live --make-iso --volid ${volid} --iso-only --iso-name Fedora-${subv}-Live-${arch}-${advortask}.iso --releasever ${releasever} --macboot\"", 7200; unless (script_run "mock -r openqa --isolation=simple --copyout /chroot_tmpdir/lmc-logs/livemedia-out.log .", 90) { upload_logs "livemedia-out.log"; }