From: Ian Campbell <ian.campbell@citrix.com>
Date: Mon, 18 Jan 2016 14:28:53 +0000 (+0000)
Subject: make-flight: Set di_version runvar on d-i based test jobs.
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=657a35e66e77cd0796dc3dcee8c054370193f16b;p=people%2Fliuw%2Fosstest.git

make-flight: Set di_version runvar on d-i based test jobs.

Note that make-distros-flight does not want this, since it uses d-i
fetched from the web not the version in our config.

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

diff --git a/make-flight b/make-flight
index 6b2b3ea..e9cad0a 100755
--- a/make-flight
+++ b/make-flight
@@ -33,6 +33,7 @@ flight=`./cs-flight-create $blessing $branch`
 
 defsuite=`getconfig DebianSuite`
 defguestsuite=`getconfig GuestDebianSuite`
+guest_di_version=`getconfig TftpDiVersion`
 
 case "$branch" in
 xen-unstable-smoke)
@@ -433,6 +434,7 @@ do_pygrub_tests () {
     test-debian-di xl $xenarch $dom0arch                \
       debian_arch=amd64                                 \
       debian_suite=$guestsuite                          \
+      debian_di_version=$guest_di_version               \
       debian_method=netboot                             \
       debian_bootloader=pygrub                          \
       all_hostflags=$most_hostflags
@@ -447,6 +449,7 @@ do_pvgrub_tests () {
     test-debian-di xl $xenarch $dom0arch                        \
       debian_arch=amd64                                         \
       debian_suite=$guestsuite                                  \
+      debian_di_version=$guest_di_version                       \
       debian_method=netboot                                     \
       debian_bootloader=pvgrub                                  \
       all_hostflags=$most_hostflags                             \
@@ -455,6 +458,7 @@ do_pvgrub_tests () {
     test-debian-di xl $xenarch $dom0arch                        \
       debian_arch=i386                                          \
       debian_suite=$guestsuite                                  \
+      debian_di_version=$guest_di_version                       \
       debian_method=netboot                                     \
       debian_bootloader=pvgrub                                  \
       all_hostflags=$most_hostflags