Revert "make-flight etc.: drop arm64"

We have the laxtons back and they seem to be working.

This reverts commit 329ef52c9866b2a8608a598836b7d5813de1e979.

Acked-by: Julien Grall <julien.grall@linaro.org>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/make-flight b/make-flight
index 76620c1863e89a0726f27fd465b0680a0e4cbdfd..48fbc01c7dd91263451bd2661c30a604abfccb9e 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -634,7 +634,7 @@ do_pv_debian_tests () {
   # Within each fmt we rotate through the list of arches
   # The starting list rotates once per ts, so that we try to
   # exercise each fmt on each arch family.
-  local fmtarches_outer="i386 armhf amd64"
+  local fmtarches_outer="i386 armhf amd64 arm64"
   local endfmt="do_pv_debian_tests-missing-ts-fmt-for-dom0arch="
 
   for ts in xl libvirt ; do

diff --git a/make-hosts-flight b/make-hosts-flight
index ff8c84ae6fab59ae7574bec1fb30924c48d7d68e..d56708573e3e759746f9e516c6ceec64c85ca99f 100755 (executable)
--- a/make-hosts-flight
+++ b/make-hosts-flight
@@ -25,7 +25,7 @@ hostflags=$3
 blessing=$4
 buildflight=$5
 
-: ${ALL_ARCHES:=amd64 i386 armhf}
+: ${ALL_ARCHES:=amd64 i386 arm64 armhf}
 : ${ALL_SUITES:=jessie stretch}
 
 : ${PERHOST_MAXWAIT:=20000} # seconds

diff --git a/mfi-common b/mfi-common
index a86c87cc0ca87940a3132f20c8083ccea3f092b1..8a9546ab6cff4d54432d3c7bb59be634bbf727f9 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -158,7 +158,7 @@ create_build_jobs () {
      BUILD_RUNVARS+=" build_lvextend_max=$BUILD_LVEXTEND_MAX "
   fi
 
-  for arch in ${BUILD_ARCHES- i386 amd64 armhf }; do
+  for arch in ${BUILD_ARCHES- i386 amd64 armhf arm64 }; do
 
     if [ "x$arch" = xdisable ]; then continue; fi
 
@@ -459,7 +459,7 @@ test_matrix_iterate () {
       ;;
   esac
 
-  for xenarch in ${TEST_ARCHES- i386 amd64 armhf } ; do
+  for xenarch in ${TEST_ARCHES- i386 amd64 armhf arm64 } ; do
 
     if [ "x$xenarch" = xdisable ]; then continue; fi
 
@@ -517,7 +517,7 @@ test_matrix_iterate () {
       *)          echo >&2 "kernkind ?  $kern"; exit 1 ;;
       esac
 
-      for dom0arch in i386 amd64 armhf; do
+      for dom0arch in i386 amd64 armhf arm64; do
 
         case ${xenarch}_${dom0arch} in
             amd64_amd64) ;;