mfi-common: usual_debianhvm_image: derive version from $guestsuite

This more likely matches the callers intention.

Move the setting into production-config* alongside the Suite and
TftpDiVersion settings. Continue to support $DEBIAN_IMAGE_VERSION as an
override. The value for Wheezy is from what was replaced
in 610ea1628363 "Switch to Debian 8.0 (jessie) as OS for test hosts".

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/mfi-common b/mfi-common
index 8a1230a2930e76d0e67021ab9a99161a0ab61771..ab7c5e3a007d8298ca8c17f994b5ad7eb5ca1762 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -342,7 +342,11 @@ job_create_test () {
 
 usual_debianhvm_image () {
   local arch=$1; shift
-  echo debian-${DEBIAN_IMAGE_VERSION-8.2.0}-$arch-CD-1.iso
+  local ver=$DEBIAN_IMAGE_VERSION
+  if [ -z "$ver" ] ; then
+      ver=`getconfig DebianImageVersion_$guestsuite`
+  fi
+  echo debian-$ver-$arch-CD-1.iso
 }
 
 # Iterate over xenarch, dom0arch and kernel calling test_matrix_do_one

diff --git a/production-config b/production-config
index d9cc32749ed020576c37078e86c6e4e10607056a..6d25fd804251f7a10ba2a7134943f16f3ab3a6f9 100644 (file)
--- a/production-config
+++ b/production-config
@@ -90,6 +90,10 @@ TftpPxeGroup osstest
 TftpDiVersion_wheezy 2015-09-07
 TftpDiVersion_jessie 2016-01-24
 
+# For ISO installs
+DebianImageVersion_wheezy 7.2.0
+DebianImageVersion_jessie 8.2.0
+
 # These should normally be the same.
 # Update with ./mg-cpu-microcode-update
 MicrocodeUpdateAmd64 microcode.x86.2015-06-12.cpio

diff --git a/production-config-cambridge b/production-config-cambridge
index 43de483bed0c0a20db0dce4606e12b4a3049a49e..41cd8aab8ecad0c9626608a72c0c29f837c97eeb 100644 (file)
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -72,6 +72,10 @@ TftpPxeGroup osstest
 TftpDiVersion_wheezy 2015-09-07
 TftpDiVersion_jessie 2016-01-24
 
+# For ISO installs
+DebianImageVersion_wheezy 7.2.0
+DebianImageVersion_jessie 8.2.0
+
 # These should normally be the same.
 MicrocodeUpdateAmd64 microcode.x86.2015-06-12.cpio
 MicrocodeUpdateI386 microcode.x86.2015-06-12.cpio