@@ -72,6 +72,8 @@ job_create_build_filter_callback () {
build-amd64-libvirt) ;;
build-armhf) ;;
build-armhf-pvops) ;;
+ build-arm64) ;;
+ build-arm64-pvops) ;;
*) return 1 ;;
esac
;;
@@ -107,6 +109,7 @@ job_create_test_filter_callback () {
case "$job" in
test-amd64-amd64-libvirt) return 0 ;;
test-armhf-armhf-xl) return 0 ;;
+ test-arm64-arm64-xl-xsm) return 0 ;;
test-amd64-amd64-xl-qemuu-debianhvm-i386) return 0 ;;
*) return 1 ;;
esac
@@ -184,7 +187,7 @@ job_create_test_filter_callback () {
arch_branch_filter_callback () {
local arch=$1
case "$arch" in
- armhf)
+ arm*)
case "$branch" in
linux-3.0) return 1;;
linux-3.4) return 1;;
@@ -572,7 +575,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 armhf"
+ local fmtarches_outer="i386 armhf amd64 arm64"
local endfmt="do_pv_debian_tests-missing-ts-fmt-for-dom0arch="
for ts in xl libvirt ; do
@@ -628,7 +631,7 @@ test_matrix_do_one () {
do_credit2_tests
# No further arm tests at the moment
- if [ $dom0arch = armhf ]; then
+ if [ $dom0arch = armhf -o $dom0arch = arm64 ]; then
return
fi
@@ -109,7 +109,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
@@ -131,6 +131,16 @@ create_build_jobs () {
kconfig_override_y=CONFIG_EXT4_FS
"
;;
+ arm64)
+ case "$xenbranch" in
+ xen-3.*-testing) continue;;
+ xen-4.[0-6]-testing) continue;;
+ esac
+ pvops_kernel="
+ tree_linux=$TREE_LINUX_ARM
+ revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}}
+ "
+ ;;
*)
pvops_kernel="
tree_linux=$TREE_LINUX
@@ -316,7 +326,7 @@ create_build_jobs () {
fi
case "$arch" in
- armhf) continue;; # don't do any other kernel builds
+ arm*) continue;; # don't do any other kernel builds
esac
if [ "x$REVISION_LINUX_OLD" != xdisable ]; then
@@ -410,7 +420,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
@@ -427,6 +437,14 @@ test_matrix_iterate () {
*) ;;
esac
;;
+ arm64)
+ # ARM64 from 4.6 onwards only
+ case "$xenbranch" in
+ xen-3.*-testing) continue;;
+ xen-4.[0-6]-testing) continue;;
+ *) ;;
+ esac
+ ;;
i386)
# 32-bit Xen is dropped from 4.3 onwards
case "$xenbranch" in
@@ -460,13 +478,14 @@ 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) ;;
amd64_i386) ;;
i386_i386) ;;
armhf_armhf) ;;
+ arm64_arm64) ;;
*) continue ;;
esac
@@ -112,6 +112,7 @@ done
# backports.
case ${suite}_${arch} in
wheezy_armhf) bpok=armmp; need_initramfs=y;;
+ jessie_arm64) bpok=arm64 ;;
esac
if [ x$bpok != x ]; then
bp="$sbase-backports"
Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com> --- make-flight | 9 ++++++--- mfi-common | 27 +++++++++++++++++++++++---- mg-debian-installer-update | 1 + 3 files changed, 30 insertions(+), 7 deletions(-)