[OSSTEST,v2,10/12] Qualify TftpDiVersion with the suite.

Commit Message

Ian Campbell Jan. 18, 2016, 2:28 p.m. UTC

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 <[e-mail]>
Acked-by: Ian Jackson <[e-mail]>
---
v2: di_version
---
 Osstest.pm                  |  2 +-
 make-flight                 | 10 +++++++++-
 production-config           |  3 ++-
 production-config-cambridge |  3 ++-
 4 files changed, 14 insertions(+), 4 deletions(-)

Patch

diff --git a/Osstest.pm b/Osstest.pm
index 9ff86ab..814be28 100644
--- 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 e0d9e0c..885870c 100755
--- 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 b21153b..42948c8 100644
--- a/production-config
+++ b/production-config
@@ -87,7 +87,8 @@  TftpPxeTemplatesReal pxelinux.cfg/%ipaddrhex%
 
 TftpPxeGroup osstest
 # Update with ./mg-debian-installer-update(-all)
-TftpDiVersion 2015-09-18
+TftpDiVersion_wheezy 2015-09-07
+TftpDiVersion_jessie 2015-09-18
 
 # These should normally be the same.
 # Update with ./mg-cpu-microcode-update
diff --git a/production-config-cambridge b/production-config-cambridge
index b0b45ac..78d606b 100644
--- a/production-config-cambridge
+++ b/production-config-cambridge
@@ -69,7 +69,8 @@  TftpPxeTemplates %name%/pxelinux.cfg
 TftpPxeTemplatesReal pxelinux.cfg/%ipaddrhex%
 
 TftpPxeGroup osstest
-TftpDiVersion 2015-09-18
+TftpDiVersion_wheezy 2015-09-07
+TftpDiVersion_jessie 2015-09-18
 
 # These should normally be the same.
 MicrocodeUpdateAmd64 microcode.x86.2015-06-12.cpio