Switch ARM testing back to linux-arm-xen branch.

The cubietruck and arndale boards need a newer kernel than our current
baseline of 3.14. Therefore switch all ARM testing to the
linux-arm-kernel branch which has been moved up to test v3.16.

This effectively reverts commit 38b2fe2020883 "Switch armhf to use
common default Linux."

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>

diff --git a/mfi-common b/mfi-common
index e16760649879338eaef709d52a5d4b7c0211dbb3..7ccff40f7acbfa3e8c60365b2b01555560676f9b 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -73,6 +73,10 @@ create_build_jobs () {
       xen-4.1-testing) continue;;
       xen-4.2-testing) continue;;
       esac
+      pvops_kernel="
+        tree_linux=$TREE_LINUX_ARM
+        revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}}
+      "
       pvops_kconfig_overrides="
         kconfig_override_y=CONFIG_EXT4_FS
       "
@@ -81,15 +85,12 @@ create_build_jobs () {
       case "$branch" in
       linux-arm-xen) continue;;
       esac
-      ;;
-    esac
-
-    if [ "x$pvops_kernel" = x ] ; then
       pvops_kernel="
         tree_linux=$TREE_LINUX
         revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}}
       "
-    fi
+      ;;
+    esac
 
     case "$arch" in
     *)     suite=$defsuite;;