@@ -340,7 +340,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
@@ -90,6 +90,10 @@ TftpPxeGroup osstest
TftpDiVersion_wheezy 2015-09-07
TftpDiVersion_jessie 2015-09-18
+# 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
@@ -72,6 +72,10 @@ TftpPxeGroup osstest
TftpDiVersion_wheezy 2015-09-07
TftpDiVersion_jessie 2015-09-18
+# 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