Merge ~seb128/qa-jenkins-jobs:correct-iso-variant into qa-jenkins-jobs:master

[Sebastien Bacher]

[Paride Legovini (paride)]

LGTM, thanks!

review: Approve

diff --git a/scripts/iso-testing/run-iso-test.sh b/scripts/iso-testing/run-iso-test.sh
index e7a3c0d..bec5e6d 100755
--- a/scripts/iso-testing/run-iso-test.sh
+++ b/scripts/iso-testing/run-iso-test.sh
@@ -74,6 +74,9 @@ while true ; do
     esac
 done
 
+# set the isoname before overwriting the variant
+isoname="$release-$variant-$arch.iso"
+
 desktop_replace_autoinstall=false
 # Handle legacy and desktop the same way but with different preseed
 if [ "$variant" = "desktop-legacy" ]; then
@@ -120,7 +123,7 @@ done
 if [ -n "$iso" ]; then
     cmd="./scripts/$test.sh -i $iso"
 else
-    cmd="./scripts/$test.sh -i /var/cache/utah/iso/$release-$variant-$arch.iso"
+    cmd="./scripts/$test.sh -i /var/cache/utah/iso/$isoname"
 fi
 
 if [ ! -z "$machine_prefix" ] ; then