make-flight: Break out usual_debianhvm_image and honour DEBIAN_IMAGE_VERSION

No functional change.  (Verified for xen-unstable with
standalone-generate-dump-flight-runvars.)

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Tested-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---
v17: New patch.

diff --git a/make-flight b/make-flight
index 28820f5c9368d04b17e4cb7d7cc07a1388212bf5..f9080177c670572331769dc224b46640fb28827c 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -285,7 +285,7 @@ do_hvm_debian_test_one () {
     test-debianhvm $toolstack $xenarch $dom0arch $qemuu_runvar \
     enable_xsm=$xsm                             \
     $stubdom_runvar $testvars                   \
-    debianhvm_image=debian-7.2.0-$arch-CD-1.iso \
+    debianhvm_image=$(usual_debianhvm_image $arch) \
     debianhvm_iso_kernel=/$iso_dir/vmlinuz \
     debianhvm_iso_ramdisk=/$iso_dir/initrd.gz \
     bios=$bios \

diff --git a/mfi-common b/mfi-common
index fab4aa37bc9dc41a698dd27cc4abe4045db515f8..5fbe195941ff46e71b7506ea70e865d7fb9966ab 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -351,6 +351,11 @@ job_create_test () {
     xenbuildjob=$xenbuildjob buildjob=$buildjob $tsbuildjob "$@"
 }
 
+usual_debianhvm_image () {
+  local arch=$1; shift
+  echo debian-${DEBIAN_IMAGE_VERSION-7.2.0}-$arch-CD-1.iso
+}
+
 # Iterate over xenarch, dom0arch and kernel calling test_matrix_do_one
 # for each combination.
 #