From fac0cf32e2ec51bc2d2c460929ff4c46b86a2ff3 Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 27 Sep 2013 13:17:27 +0100
Subject: [PATCH] make-flight: further reduce unwanted combinations

Drop armhf build and test jobs from tests of branches:
  - qemu-upstream-unstable
  - qemu-upstream-4.2-testing
  - qemu-upstream-4.3-testing
  - linux-3.10
  - linux-3.4

In principal these are harmless but in practice they are stretching our
available armhf build resources very thin. In addition spurious armhf failures
now won't affect these branches.

Drop non-armhf arch builds and tests from linux-arm-xen.
---
 make-flight | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/make-flight b/make-flight
index 07fb4a2..a5d21af 100755
--- a/make-flight
+++ b/make-flight
@@ -45,6 +45,11 @@ if [ x$buildflight = x ]; then
 
     case "$arch" in
     armhf)
+      case "$branch" in
+      linux-arm-xen) ;;
+      linux-*) continue;;
+      qemu-*) continue;;
+      esac
       case "$xenbranch" in
       xen-3.*-testing) continue;;
       xen-4.0-testing) continue;;
@@ -57,6 +62,9 @@ if [ x$buildflight = x ]; then
       "
       ;;
     *)
+      case "$branch" in
+      linux-arm-xen) continue;;
+      esac
       pvops_kernel="
 	tree_linux=$TREE_LINUX
 	revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}}
@@ -237,6 +245,11 @@ for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
 	xen-4.2-testing) continue;;
 	*) ;;
 	esac
+	case "$branch" in
+	linux-arm-xen) ;;
+	linux-*) continue;;
+	qemu-*) continue;;
+	esac
 	;;
   i386)
 	# 32-bit Xen is dropped from 4.3 onwards
@@ -247,7 +260,14 @@ for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
 	xen-4.2-testing) ;;
 	*) continue ;;
 	esac
+	case "$branch" in
+	linux-arm-xen) continue;;
+	esac
 	;;
+  amd64)
+	case "$branch" in
+	linux-arm-xen) continue;;
+	esac
   esac
 
   case "$xenarch" in
-- 
2.39.5