Qualify TftpDiVersion with the suite.

This allows the version to differ e.g. between Wheezy and Jessie.

Update production-config* to set TftpDiVersion_jessie instead of just
TftpDiVersion, also add TftpDiVersion_wheezy using the version
replaced in commit f610ea162836 "Switch to Debian 8.0 (jessie) as OS
for test hosts".

In mfi-common we need to check for TftpDiVersion_$suite (_$guestsuite)
and TftpDiVersion manually since getconfig In that context will not
see any DebianSuite override in the environment.

This ensures that when a non-default suite is configured a
corresponding useful version of DI is selected.

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

diff --git a/Osstest.pm b/Osstest.pm
index 9ff86ab2650a716c5087dd5c6c6469b428cd5262..814be2870843f81bf99e448b6481ed3a6f743155 100644 (file)
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -224,7 +224,7 @@ sub readglobalconfig () {
     $c{TftpTmpDir} ||= "$c{TftpPlayDir}tmp/";
 
     $c{TftpDiBase} ||= "$c{TftpPlayDir}debian-installer";
-    $c{TftpDiVersion} ||= 'current';
+    $c{TftpDiVersion} ||= $c{ "TftpDiVersion_$c{DebianSuite}" } // 'current';
 
     $c{TftpGrubBase} ||= "$c{TftpPlayDir}grub";
     $c{TftpGrubVersion} ||= 'current';

diff --git a/make-flight b/make-flight
index e0d9e0c03d63641cc691d16ccdbb7533406b34a7..885870cd91f55c792a3fda236d1c0c1bbb070563 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -33,7 +33,15 @@ flight=`./cs-flight-create $blessing $branch`
 
 defsuite=`getconfig DebianSuite`
 defguestsuite=`getconfig GuestDebianSuite`
-defdi_version=`getconfig TftpDiVersion`
+
+# Pick default Debian Installer version to correspond to the chosen
+# suite.
+if [ -z "$defdi_version" -a -n "$defsuite" ] ; then
+    defdi_version=`getconfig TftpDiVersion_$defsuite`
+fi
+if [ -z "$defdi_version" ] ; then
+    defdi_version=`getconfig TftpDiVersion`
+fi
 
 guest_di_version=$defdi_version
 

diff --git a/production-config b/production-config
index 410893e5dd8a08af3588e0978f0abeb20400866e..d9cc32749ed020576c37078e86c6e4e10607056a 100644 (file)
--- a/production-config
+++ b/production-config
@@ -87,7 +87,8 @@ TftpPxeTemplatesReal pxelinux.cfg/%ipaddrhex%
 
 TftpPxeGroup osstest
 # Update with ./mg-debian-installer-update(-all)
-TftpDiVersion 2016-01-24
+TftpDiVersion_wheezy 2015-09-07
+TftpDiVersion_jessie 2016-01-24
 
 # These should normally be the same.
 # Update with ./mg-cpu-microcode-update

diff --git a/production-config-cambridge b/production-config-cambridge
index 6b74eb203f1217e76ea4c93a76c9085b5456d0f4..43de483bed0c0a20db0dce4606e12b4a3049a49e 100644 (file)
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -69,7 +69,8 @@ TftpPxeTemplates %name%/pxelinux.cfg
 TftpPxeTemplatesReal pxelinux.cfg/%ipaddrhex%
 
 TftpPxeGroup osstest
-TftpDiVersion 2016-01-24
+TftpDiVersion_wheezy 2015-09-07
+TftpDiVersion_jessie 2016-01-24
 
 # These should normally be the same.
 MicrocodeUpdateAmd64 microcode.x86.2015-06-12.cpio