From aef5cde0b5414e44afbc1081ff25b0451c9875f1 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 18 Jan 2016 14:28:50 +0000 Subject: [PATCH] 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 Acked-by: Ian Jackson --- mfi-common | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mfi-common b/mfi-common index db12be8..24bec80 100644 --- 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 -- 2.39.5