[Xen-devel] [PATCH OSSTEST v2 05/12] mfi-common: Always add debian_suite to debian_runvars

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

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@xxxxxxxxxx>
---
v2: Replaces "make-*flight: Abolish $defsuite and $guestdefsuite",
just always set debian_suite.

@@ -444,13 +444,42 @@
 xen-unstable               test-amd64-amd64-xl-pvh-intel                       
  debian_pvh                   1
 xen-unstable               test-amd64-amd64-amd64-pvgrub                       
  debian_suite                 jessie
 xen-unstable               test-amd64-amd64-i386-pvgrub                        
  debian_suite                 jessie
+xen-unstable               test-amd64-amd64-libvirt                            
  debian_suite                 jessie
+xen-unstable               test-amd64-amd64-libvirt-pair                       
  debian_suite                 jessie
 xen-unstable               test-amd64-amd64-libvirt-vhd                        
  debian_suite                 jessie
+xen-unstable               test-amd64-amd64-libvirt-xsm                        
  debian_suite                 jessie
+xen-unstable               test-amd64-amd64-migrupgrade                        
  debian_suite                 jessie
+xen-unstable               test-amd64-amd64-pair                               
  debian_suite                 jessie
 xen-unstable               test-amd64-amd64-pygrub                             
  debian_suite                 jessie
+xen-unstable               test-amd64-amd64-xl                                 
  debian_suite                 jessie
+xen-unstable               test-amd64-amd64-xl-credit2                         
  debian_suite                 jessie
+xen-unstable               test-amd64-amd64-xl-multivcpu                       
  debian_suite                 jessie
+xen-unstable               test-amd64-amd64-xl-pvh-amd                         
  debian_suite                 jessie
+xen-unstable               test-amd64-amd64-xl-pvh-intel                       
  debian_suite                 jessie
 xen-unstable               test-amd64-amd64-xl-qcow2                           
  debian_suite                 jessie
+xen-unstable               test-amd64-amd64-xl-rtds                            
  debian_suite                 jessie
+xen-unstable               test-amd64-amd64-xl-xsm                             
  debian_suite                 jessie
+xen-unstable               test-amd64-i386-libvirt                             
  debian_suite                 jessie
+xen-unstable               test-amd64-i386-libvirt-pair                        
  debian_suite                 jessie
+xen-unstable               test-amd64-i386-libvirt-xsm                         
  debian_suite                 jessie
+xen-unstable               test-amd64-i386-migrupgrade                         
  debian_suite                 jessie
+xen-unstable               test-amd64-i386-pair                                
  debian_suite                 jessie
+xen-unstable               test-amd64-i386-xl                                  
  debian_suite                 jessie
 xen-unstable               test-amd64-i386-xl-raw                              
  debian_suite                 jessie
+xen-unstable               test-amd64-i386-xl-xsm                              
  debian_suite                 jessie
+xen-unstable               test-armhf-armhf-libvirt                            
  debian_suite                 jessie
 xen-unstable               test-armhf-armhf-libvirt-qcow2                      
  debian_suite                 jessie
 xen-unstable               test-armhf-armhf-libvirt-raw                        
  debian_suite                 jessie
+xen-unstable               test-armhf-armhf-libvirt-xsm                        
  debian_suite                 jessie
+xen-unstable               test-armhf-armhf-xl                                 
  debian_suite                 jessie
+xen-unstable               test-armhf-armhf-xl-arndale                         
  debian_suite                 jessie
+xen-unstable               test-armhf-armhf-xl-credit2                         
  debian_suite                 jessie
+xen-unstable               test-armhf-armhf-xl-cubietruck                      
  debian_suite                 jessie
+xen-unstable               test-armhf-armhf-xl-midway                          
  debian_suite                 jessie
+xen-unstable               test-armhf-armhf-xl-multivcpu                       
  debian_suite                 jessie
+xen-unstable               test-armhf-armhf-xl-rtds                            
  debian_suite                 jessie
 xen-unstable               test-armhf-armhf-xl-vhd                             
  debian_suite                 jessie
+xen-unstable               test-armhf-armhf-xl-xsm                             
  debian_suite                 jessie
 xen-unstable               test-amd64-amd64-libvirt-qemuu-debianhvm-amd64-xsm  
  debianhvm_image              debian-8.2.0-amd64-CD-1.iso
 xen-unstable               test-amd64-amd64-xl-qemut-debianhvm-amd64           
  debianhvm_image              debian-8.2.0-amd64-CD-1.iso
 xen-unstable               test-amd64-amd64-xl-qemut-debianhvm-amd64-xsm       
  debianhvm_image              debian-8.2.0-amd64-CD-1.iso
---
 mfi-common | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mfi-common b/mfi-common
index 0e2b64f..1fcdb98 100644
--- a/mfi-common
+++ b/mfi-common
@@ -351,7 +351,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 ;;
@@ -431,10 +431,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.6.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel