mfi-common: Set di_version for build & test host install

This means that bisections will use the same version, even if
production-config changed in the mean time.

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 e9cad0a166043225f3afdbc6b6d2c91bee294695..e0d9e0c03d63641cc691d16ccdbb7533406b34a7 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -33,7 +33,9 @@ flight=`./cs-flight-create $blessing $branch`
 
 defsuite=`getconfig DebianSuite`
 defguestsuite=`getconfig GuestDebianSuite`
-guest_di_version=`getconfig TftpDiVersion`
+defdi_version=`getconfig TftpDiVersion`
+
+guest_di_version=$defdi_version
 
 case "$branch" in
 xen-unstable-smoke)

diff --git a/mfi-common b/mfi-common
index 24bec8041b6452b2d0364075da256292be1539ff..8a1230a2930e76d0e67021ab9a99161a0ab61771 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -80,7 +80,7 @@ create_build_jobs () {
 
   local arch
   local pvops_kernel pvops_kconfig_overrides
-  local suite hostos_runvars
+  local suite di_version hostos_runvars
   local want_xend build_defxend build_extraxend
   local enable_ovmf
   local build_hostflags
@@ -120,10 +120,10 @@ create_build_jobs () {
     esac
 
     case "$arch" in
-    *)     suite=$defsuite;;
+    *)     suite=$defsuite; di_version=$defdi_version;;
     esac
 
-    hostos_runvars="all_host_suite=$suite"
+    hostos_runvars="all_host_suite=$suite all_host_di_version=$di_version"
 
     # In 4.4 onwards xend is off by default. If necessary we build a
     # separate set of binaries with xend enabled in order to run those
@@ -353,7 +353,7 @@ usual_debianhvm_image () {
 # Provides various convenience variables for the callback.
 #
 test_matrix_iterate () {
-  local suite guestsuite hostos_runvars
+  local suite guestsuite di_version hostos_runvars
 
   case "$xenbranch" in
   xen-3.*-testing)      pairtoolstack=xend ;;
@@ -404,10 +404,13 @@ test_matrix_iterate () {
     esac
 
     case "$xenarch" in
-    *)     suite=$defsuite; guestsuite=$defguestsuite;;
+    *)     suite=$defsuite
+           guestsuite=$defguestsuite
+           di_version=$defdi_version
+           ;;
     esac
 
-    hostos_runvars="all_host_suite=$suite"
+    hostos_runvars="all_host_suite=$suite all_host_di_version=$di_version"
 
     for kern in ''; do