make-flight: correct use of $xenbranch

This variable has the form xen-X.Y-testing or xen-unstable, not just unstable
or X.Y.

The affect of this change is to:

  - Drop from 4.2 and earlier:
    - build-armhf
    - build-armhf-pvops

  - Drop from 4.1 and earlier:
    - test-i386-i386-xl-qemuu-winxpsp3
    - test-amd64-amd64-xl-qemuu-win7-amd64
    - test-amd64-amd64-xl-qemuu-winxpsp3
    - test-amd64-i386-qemuu-rhel6hvm-amd
    - test-amd64-i386-qemuu-rhel6hvm-intel
    - test-i386-i386-xl-qemuu-winxpsp3

  - Drop the runvars associated with all the above

  - On 4.1 and sooner:
    - Switch test-*-*-pair toolstack runvar from xl to xend.

diff --git a/make-flight b/make-flight
index 070fba361c62d416cd3e3fd40b1a24c994807387..07fb4a2e9b919e61d221b739e1797949608af41a 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -46,7 +46,10 @@ if [ x$buildflight = x ]; then
     case "$arch" in
     armhf)
       case "$xenbranch" in
-      3.*|4.0|4.1|4.2) continue;;
+      xen-3.*-testing) continue;;
+      xen-4.0-testing) continue;;
+      xen-4.1-testing) continue;;
+      xen-4.2-testing) continue;;
       esac
       pvops_kernel="
        tree_linux=$TREE_LINUX_ARM
@@ -259,8 +262,10 @@ for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
   fi
 
   case "$xenbranch" in
-  3.*|4.1)     onetoolstack=xend ;;
-  *)           onetoolstack=xl ;;
+  xen-3.*-testing)     onetoolstack=xend ;;
+  xen-4.0-testing)     onetoolstack=xend ;;
+  xen-4.1-testing)     onetoolstack=xend ;;
+  *)                   onetoolstack=xl ;;
   esac
 
   for kern in ''; do
@@ -332,7 +337,9 @@ for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
                 ;;
           -qemuu)
                 case $xenbranch in
-                3.4|4.0|4.1)    continue ;;
+                xen-3.*-testing) continue;;
+                xen-4.0-testing) continue;;
+                xen-4.1-testing) continue;;
                 esac
                 qemuu_runvar=device_model_version=qemu-xen
                 ;;