[PATCH RFC OSSTEST v1 08/12] make-flight: Set diversion runvar on d-i based test jobs.

From: Ian Campbell <ian.campbell@citrix.com>
To: ian.jackson@eu.citrix.com, xen-devel@lists.xen.org
Cc: Ian Campbell <ian.campbell@citrix.com>
Subject: [PATCH RFC OSSTEST v1 08/12] make-flight: Set diversion runvar on d-i based test jobs.
Date: Fri, 8 Jan 2016 14:29:55 +0000	[thread overview]
Message-ID: <1452263399-14094-8-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1452263368.29416.39.camel@citrix.com>

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>
---
 make-flight | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/make-flight b/make-flight
index 50abf97..3b3950a 100755
--- a/make-flight
+++ b/make-flight
@@ -31,6 +31,8 @@ flight=`./cs-flight-create $blessing $branch`
 . ./ap-common
 . ./mfi-common
 
+guestdiversion=`getconfig TftpDiVersion`
+
 case "$branch" in
 xen-unstable-smoke)
 	global_runvars+=" hostalloc_maxbonus_variation~=0 "
@@ -430,6 +432,7 @@ do_pygrub_tests () {
     test-debian-di xl $xenarch $dom0arch                \
       debian_arch=amd64                                 \
       debian_suite=$guestsuite                          \
+      debian_diversion=$guestdiversion                  \
       debian_method=netboot                             \
       debian_bootloader=pygrub                          \
       all_hostflags=$most_hostflags
@@ -444,6 +447,7 @@ do_pvgrub_tests () {
     test-debian-di xl $xenarch $dom0arch                        \
       debian_arch=amd64                                         \
       debian_suite=$guestsuite                                  \
+      debian_diversion=$guestdiversion                          \
       debian_method=netboot                                     \
       debian_bootloader=pvgrub                                  \
       all_hostflags=$most_hostflags                             \
@@ -452,6 +456,7 @@ do_pvgrub_tests () {
     test-debian-di xl $xenarch $dom0arch                        \
       debian_arch=i386                                          \
       debian_suite=$guestsuite                                  \
+      debian_diversion=$guestdiversion                          \
       debian_method=netboot                                     \
       debian_bootloader=pvgrub                                  \
       all_hostflags=$most_hostflags
-- 
2.6.1
