[OSSTEST,1/2] make-flight: Rework arch_branch_filter_callback slightly

Commit Message

Ian Jackson Oct. 23, 2019, 3:01 p.m. UTC

Now we have two lists of things not supported on ARM: one of branches
where that's inherent in the branch somehow, and one for those where
the kernel is simply too old.  The latter are going to differ between
armhf and arm64.

No functional change.
(Verified with standalone-generate-dump-flight-runvars.)

Signed-off-by: Ian Jackson <[e-mail]>
---
 make-flight | 7 ++++++-
 mfi-common  | 4 ++++
 2 files changed, 10 insertions(+), 1 deletion(-)

Patch

diff --git a/make-flight b/make-flight
index 020ad5f1..f90fe77c 100755
--- a/make-flight
+++ b/make-flight
@@ -189,8 +189,13 @@  arch_branch_filter_callback () {
         linux-3.4) return 1;;
         linux-3.10) return 1;;
         linux-3.14) return 1;;
+        esac
+        ;;
+  esac
+  case "$arch" in
+  arm*)
+        case "$branch" in
         linux-mingo-tip-master) return 1;;
-        linux-*) ;;
         qemu-upstream-4.2-testing) return 1;;
         qemu-upstream-4.3-testing) return 1;;
         qemu-upstream-4.4-testing) return 1;;
diff --git a/mfi-common b/mfi-common
index 7c03ffd4..b40f057e 100644
--- a/mfi-common
+++ b/mfi-common
@@ -288,6 +288,10 @@  create_build_jobs () {
       "
       ;;
     arm64)
+      case "$branch" in
+      linux-3.*-testing) continue;;
+      linux-4.[0-4]-testing) continue;;
+      esac
       case "$xenbranch" in
       xen-3.*-testing) continue;;
       xen-4.[0-6]-testing) continue;;