make-distros-flight: Always set guest_suite and defguestsuite

Abolish the shell variables $gsuite and $debian_suite (which were
referred to only in make-distros-flight) and set and use the variables
guest_suite and defguestsuite.

These variables are used by the machinery in mfi-common to populate
the runvars.

No functional change (as seen in standalone-generate-dump-flight-runvars,
with mg-list-all-branches edited to use crontab-cambridge).

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/make-distros-flight b/make-distros-flight
index fa5b71bb707490f213006a0e052415c0b3312e23..8ab00b13efc404fa223ec8e1502049347c63b51f 100755 (executable)
--- a/make-distros-flight
+++ b/make-distros-flight
@@ -31,14 +31,15 @@ flight=`./cs-flight-create $blessing $branch`
 . ./mfi-common
 
 defsuite=`getconfig DebianSuite`
-defguestsuite=`getconfig GuestDebianSuite`
 
 case $branch in
-  distros-debian-snapshot) debian_suite=sid ;;
-  distros-debian-*) debian_suite=${branch#distros-debian-} ;;
+  distros-debian-snapshot) guest_suite=sid ;;
+  distros-debian-*) guest_suite=${branch#distros-debian-} ;;
   *)                echo $branch >&2; exit 1               ;;
 esac
 
+defguestsuite=$guest_suite
+
 job_create_build_filter_callback () {
   local job=$1; shift
 
@@ -74,11 +75,11 @@ test_do_one_netboot () {
     #local mirror="http://`getconfig DebianMirrorHost`/`getconfig DebianMirrorSubpath`"
     # XXX local mirror seems to serve up stale files.
     local mirror="http://ftp.debian.org/debian"
-    diurl="$mirror/dists/$gsuite/main/installer-$domU/current/images/netboot"
-    gver=$gsuite
+    diurl="$mirror/dists/$guest_suite/main/installer-$domU/current/images/netboot"
+    gver=$guest_suite
   fi
 
-  case ${domU}_${gsuite} in
+  case ${domU}_${guest_suite} in
     armhf_squeeze) return;; # No armhf in Squeeze
     armhf_wheezy) return;; # No armhf guest support in Wheezy
     *) ;;
@@ -96,7 +97,7 @@ test_do_one_netboot () {
       diurl="$diurl/debian-installer/arm64";;
   esac
 
-  case ${dom0arch}_${domU}_${gsuite} in
+  case ${dom0arch}_${domU}_${guest_suite} in
     arm*_arm*_*) bootloader="pygrub";; # no pvgrub for arm
 
     # Needs a menu.lst, not present in Squeeze+ due to switch to grub2,
@@ -113,7 +114,7 @@ test_do_one_netboot () {
     test-debian-di xl $xenarch $dom0arch                        \
       kernbuildjob=${bfi}build-$dom0arch-$kernbuild             \
       debian_arch=$domU                                         \
-      debian_suite=$gsuite                                      \
+      debian_suite=$guest_suite                                      \
       debian_method=netboot                                     \
       debian_netboot_kernel="$diurl/vmlinuz"                    \
       debian_netboot_ramdisk="$diurl/initrd.gz"                 \
@@ -171,12 +172,12 @@ test_matrix_do_one () {
 
   for domU in $domUarches ; do
 
-    gsuite=$debian_suite
+    guest_suite=$guest_suite
     test_do_one_netboot
 
     if [ $branch = distros-debian-snapshot ]; then
         for cd in current weekly ; do
-          case ${domU}_${gsuite} in
+          case ${domU}_${guest_suite} in
             armhf_*) continue;; # No iso targets for armhf
             *) ;;
           esac