mfi-common: Always add debian_suite to debian_runvars

This adds an explicit debian_suite to some jobs which didn't already
have one, meaning that those jobs will remain the same when cloned for
a bisect and run in a tree where $c{DebianGuestSuite} has changed
since the original construction.

No expected semantic change.

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

diff --git a/mfi-common b/mfi-common
index db12be8294f5a9d336404773b76ac46a7fa9bceb..24bec8041b6452b2d0364075da256292be1539ff 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -353,7 +353,7 @@ usual_debianhvm_image () {
 # Provides various convenience variables for the callback.
 #
 test_matrix_iterate () {
-  local hostos_runvars
+  local suite guestsuite hostos_runvars
 
   case "$xenbranch" in
   xen-3.*-testing)      pairtoolstack=xend ;;
@@ -433,10 +433,10 @@ test_matrix_iterate () {
             arch_runvars=\"\$ARCH_RUNVARS_$dom0arch\"
         "
 
-        debian_runvars="debian_kernkind=$kernkind debian_arch=$dom0arch"
-        if [ $guestsuite != $defguestsuite ] ; then
-            debian_runvars="$debian_runvars debian_suite=$guestsuite"
-        fi
+        debian_runvars="debian_kernkind=$kernkind \
+                        debian_arch=$dom0arch \
+                        debian_suite=$guestsuite \
+                        "
 
         most_hostflags="arch-$dom0arch,arch-xen-$xenarch,suite-$suite,purpose-test"
         if [ "x$min_linux_hostflag" != "x" ] ; then