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

Proposed by Sebastien Bacher
Status: Merged
Merged at revision: 0454327aee53d720f06548558aed677de1180b07
Proposed branch: ~seb128/qa-jenkins-jobs:correct-iso-variant
Merge into: qa-jenkins-jobs:master
Diff against target: 23 lines (+4/-1)
1 file modified
scripts/iso-testing/run-iso-test.sh (+4/-1)
Reviewer Review Type Date Requested Status
Paride Legovini Approve
Review via email: mp+441191@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Paride Legovini (paride) wrote :

LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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
74 esac74 esac
75done75done
7676
77# set the isoname before overwriting the variant
78isoname="$release-$variant-$arch.iso"
79
77desktop_replace_autoinstall=false80desktop_replace_autoinstall=false
78# Handle legacy and desktop the same way but with different preseed81# Handle legacy and desktop the same way but with different preseed
79if [ "$variant" = "desktop-legacy" ]; then82if [ "$variant" = "desktop-legacy" ]; then
@@ -120,7 +123,7 @@ done
120if [ -n "$iso" ]; then123if [ -n "$iso" ]; then
121 cmd="./scripts/$test.sh -i $iso"124 cmd="./scripts/$test.sh -i $iso"
122else125else
123 cmd="./scripts/$test.sh -i /var/cache/utah/iso/$release-$variant-$arch.iso"126 cmd="./scripts/$test.sh -i /var/cache/utah/iso/$isoname"
124fi127fi
125128
126if [ ! -z "$machine_prefix" ] ; then129if [ ! -z "$machine_prefix" ] ; then

Subscribers

People subscribed via source and target branches

to all changes: