From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST v2 08/19] Add arm64 build and test jobs Date: Thu, 18 Jun 2015 17:24:59 +0100 Message-ID: <1434644710-28881-8-git-send-email-ian.campbell@citrix.com> References: <1434644687.28264.53.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1434644687.28264.53.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org Runvars: build-arm64 arch arm64 build-arm64 build_lvextend_max 50 build-arm64 enable_ovmf true build-arm64 enable_xend false build-arm64 enable_xsm false build-arm64 host_hostflags share-build-jessie-arm64,arch-arm64,suite-jessie,purpose-build build-arm64 revision_ovmf build-arm64 revision_qemu build-arm64 revision_qemuu b2da824bc5ad35fb9f1e74a203d7be96a7b0345e build-arm64 revision_seabios build-arm64 revision_xen e13013dbf1d5997915548a3b5f1c39594d8c1d7b build-arm64 tree_ovmf build-arm64 tree_qemu git://xenbits.xen.org/staging/qemu-xen-unstable.git build-arm64 tree_qemuu git://xenbits.xen.org/staging/qemu-upstream-unstable.git build-arm64 tree_seabios build-arm64 tree_xen git://xenbits.xen.org/xen.git build-arm64-libvirt arch arm64 build-arm64-libvirt build_lvextend_max 50 build-arm64-libvirt buildjob build-arm64 build-arm64-libvirt host_hostflags share-build-jessie-arm64,arch-arm64,suite-jessie,purpose-build build-arm64-libvirt revision_libvirt fd74e231751334b64af0934b680c5cc62f652453 build-arm64-libvirt tree_libvirt git://xenbits.xen.org/libvirt.git build-arm64-libvirt tree_xen git://xenbits.xen.org/xen.git build-arm64-pvops arch arm64 build-arm64-pvops build_lvextend_max 50 build-arm64-pvops host_hostflags share-build-jessie-arm64,arch-arm64,suite-jessie,purpose-build build-arm64-pvops kconfig_override_y CONFIG_EXT4_FS build-arm64-pvops kconfighow xen-enable-xen-config build-arm64-pvops revision_linux ec18c9fc039971041d854e0d58551f1f1a32ff8f build-arm64-pvops revision_linuxfirmware c530a75c1e6a472b0eb9558310b518f0dfcd8860 build-arm64-pvops tree_linux git://xenbits.xen.org/linux-pvops.git build-arm64-pvops tree_linuxfirmware git://xenbits.xen.org/osstest/linux-firmware.git build-arm64-pvops treevcs_linux git build-arm64-xsm arch arm64 build-arm64-xsm build_lvextend_max 50 build-arm64-xsm enable_ovmf true build-arm64-xsm enable_xend false build-arm64-xsm enable_xsm true build-arm64-xsm host_hostflags share-build-jessie-arm64,arch-arm64,suite-jessie,purpose-build build-arm64-xsm revision_ovmf build-arm64-xsm revision_qemu build-arm64-xsm revision_qemuu b2da824bc5ad35fb9f1e74a203d7be96a7b0345e build-arm64-xsm revision_seabios build-arm64-xsm revision_xen e13013dbf1d5997915548a3b5f1c39594d8c1d7b build-arm64-xsm tree_ovmf build-arm64-xsm tree_qemu git://xenbits.xen.org/staging/qemu-xen-unstable.git build-arm64-xsm tree_qemuu git://xenbits.xen.org/staging/qemu-upstream-unstable.git build-arm64-xsm tree_seabios build-arm64-xsm tree_xen git://xenbits.xen.org/xen.git test-arm64-arm64-libvirt all_hostflags arch-arm64,arch-xen-arm64,suite-jessie,purpose-test test-arm64-arm64-libvirt arch arm64 test-arm64-arm64-libvirt buildjob build-arm64 test-arm64-arm64-libvirt debian_arch arm64 test-arm64-arm64-libvirt debian_kernkind pvops test-arm64-arm64-libvirt enable_xsm false test-arm64-arm64-libvirt kernbuildjob build-arm64-pvops test-arm64-arm64-libvirt kernkind pvops test-arm64-arm64-libvirt libvirtbuildjob build-arm64-libvirt test-arm64-arm64-libvirt toolstack libvirt test-arm64-arm64-libvirt xenbuildjob build-arm64 test-arm64-arm64-libvirt-xsm all_hostflags arch-arm64,arch-xen-arm64,suite-jessie,purpose-test test-arm64-arm64-libvirt-xsm arch arm64 test-arm64-arm64-libvirt-xsm buildjob build-arm64-xsm test-arm64-arm64-libvirt-xsm debian_arch arm64 test-arm64-arm64-libvirt-xsm debian_kernkind pvops test-arm64-arm64-libvirt-xsm enable_xsm true test-arm64-arm64-libvirt-xsm kernbuildjob build-arm64-pvops test-arm64-arm64-libvirt-xsm kernkind pvops test-arm64-arm64-libvirt-xsm libvirtbuildjob build-arm64-libvirt test-arm64-arm64-libvirt-xsm toolstack libvirt test-arm64-arm64-libvirt-xsm xenbuildjob build-arm64-xsm test-arm64-arm64-xl all_hostflags arch-arm64,arch-xen-arm64,suite-jessie,purpose-test test-arm64-arm64-xl arch arm64 test-arm64-arm64-xl buildjob build-arm64 test-arm64-arm64-xl debian_arch arm64 test-arm64-arm64-xl debian_kernkind pvops test-arm64-arm64-xl enable_xsm false test-arm64-arm64-xl kernbuildjob build-arm64-pvops test-arm64-arm64-xl kernkind pvops test-arm64-arm64-xl toolstack xl test-arm64-arm64-xl xenbuildjob build-arm64 test-arm64-arm64-xl-credit2 all_hostflags arch-arm64,arch-xen-arm64,suite-jessie,purpose-test test-arm64-arm64-xl-credit2 arch arm64 test-arm64-arm64-xl-credit2 buildjob build-arm64 test-arm64-arm64-xl-credit2 debian_arch arm64 test-arm64-arm64-xl-credit2 debian_kernkind pvops test-arm64-arm64-xl-credit2 guests_vcpus 4 test-arm64-arm64-xl-credit2 kernbuildjob build-arm64-pvops test-arm64-arm64-xl-credit2 kernkind pvops test-arm64-arm64-xl-credit2 toolstack xl test-arm64-arm64-xl-credit2 xen_boot_append sched=credit2 test-arm64-arm64-xl-credit2 xenbuildjob build-arm64 test-arm64-arm64-xl-multivcpu all_hostflags arch-arm64,arch-xen-arm64,suite-jessie,purpose-test test-arm64-arm64-xl-multivcpu arch arm64 test-arm64-arm64-xl-multivcpu buildjob build-arm64 test-arm64-arm64-xl-multivcpu debian_arch arm64 test-arm64-arm64-xl-multivcpu debian_kernkind pvops test-arm64-arm64-xl-multivcpu guests_vcpus 4 test-arm64-arm64-xl-multivcpu kernbuildjob build-arm64-pvops test-arm64-arm64-xl-multivcpu kernkind pvops test-arm64-arm64-xl-multivcpu toolstack xl test-arm64-arm64-xl-multivcpu xenbuildjob build-arm64 test-arm64-arm64-xl-sedf all_hostflags arch-arm64,arch-xen-arm64,suite-jessie,purpose-test test-arm64-arm64-xl-sedf arch arm64 test-arm64-arm64-xl-sedf buildjob build-arm64 test-arm64-arm64-xl-sedf debian_arch arm64 test-arm64-arm64-xl-sedf debian_kernkind pvops test-arm64-arm64-xl-sedf guests_vcpus 4 test-arm64-arm64-xl-sedf kernbuildjob build-arm64-pvops test-arm64-arm64-xl-sedf kernkind pvops test-arm64-arm64-xl-sedf linux_boot_append loglevel=9 debug test-arm64-arm64-xl-sedf toolstack xl test-arm64-arm64-xl-sedf xen_boot_append sched=sedf loglvl=all test-arm64-arm64-xl-sedf xenbuildjob build-arm64 test-arm64-arm64-xl-sedf-pin all_hostflags arch-arm64,arch-xen-arm64,suite-jessie,purpose-test test-arm64-arm64-xl-sedf-pin arch arm64 test-arm64-arm64-xl-sedf-pin buildjob build-arm64 test-arm64-arm64-xl-sedf-pin debian_arch arm64 test-arm64-arm64-xl-sedf-pin debian_kernkind pvops test-arm64-arm64-xl-sedf-pin guests_vcpus 4 test-arm64-arm64-xl-sedf-pin kernbuildjob build-arm64-pvops test-arm64-arm64-xl-sedf-pin kernkind pvops test-arm64-arm64-xl-sedf-pin linux_boot_append loglevel=9 debug test-arm64-arm64-xl-sedf-pin toolstack xl test-arm64-arm64-xl-sedf-pin xen_boot_append sched=sedf loglvl=all dom0_vcpus_pin test-arm64-arm64-xl-sedf-pin xenbuildjob build-arm64 test-arm64-arm64-xl-xsm all_hostflags arch-arm64,arch-xen-arm64,suite-jessie,purpose-test test-arm64-arm64-xl-xsm arch arm64 test-arm64-arm64-xl-xsm buildjob build-arm64-xsm test-arm64-arm64-xl-xsm debian_arch arm64 test-arm64-arm64-xl-xsm debian_kernkind pvops test-arm64-arm64-xl-xsm enable_xsm true test-arm64-arm64-xl-xsm kernbuildjob build-arm64-pvops test-arm64-arm64-xl-xsm kernkind pvops test-arm64-arm64-xl-xsm toolstack xl test-arm64-arm64-xl-xsm xenbuildjob build-arm64-xsm Signed-off-by: Ian Campbell --- --- make-flight | 4 ++-- mfi-common | 23 ++++++++++++++++++----- ts-kernel-build | 1 + 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/make-flight b/make-flight index 78ace52..c821833 100755 --- a/make-flight +++ b/make-flight @@ -107,7 +107,7 @@ job_create_test_filter_callback () { test_matrix_branch_filter_callback () { case "$xenarch" in - armhf) + armhf|arm64) case "$branch" in linux-3.0) return 1;; linux-3.4) return 1;; @@ -366,7 +366,7 @@ test_matrix_do_one () { do_credit2_tests # No further arm tests at the moment - if [ $dom0arch = armhf ]; then + if [ $dom0arch = armhf ] || [ $dom0arch = arm64 ]; then return fi diff --git a/mfi-common b/mfi-common index a9e966f..ffb6775 100644 --- a/mfi-common +++ b/mfi-common @@ -67,12 +67,12 @@ 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 case "$arch" in - armhf) + armhf|arm64) case "$branch" in linux-3.0) continue;; linux-3.4) continue;; @@ -247,7 +247,7 @@ create_build_jobs () { fi case "$arch" in - armhf) continue;; # don't do any other kernel builds + armhf|arm64) continue;; # don't do any other kernel builds esac if [ "x$REVISION_LINUX_OLD" != xdisable ]; then @@ -319,13 +319,25 @@ test_matrix_iterate () { *) onetoolstack=xl ;; 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 test_matrix_branch_filter_callback || continue case "$xenarch" in + arm64) + # Arm64 from 4.5 onwards only + case "$xenbranch" in + xen-3.*-testing) continue;; + xen-4.0-testing) continue;; + xen-4.1-testing) continue;; + xen-4.2-testing) continue;; + xen-4.3-testing) continue;; + xen-4.4-testing) continue;; + *) ;; + esac + ;; armhf) # Arm from 4.3 onwards only case "$xenbranch" in @@ -370,13 +382,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 diff --git a/ts-kernel-build b/ts-kernel-build index e7cbdc1..47ddf6f 100755 --- a/ts-kernel-build +++ b/ts-kernel-build @@ -27,6 +27,7 @@ builddirsprops(); my $archparms = { 'armhf' => { DefConfig => 'multi_v7_defconfig', KernelImage => 'arch/arm/boot/zImage' }, + 'arm64' => { DefConfig => 'defconfig', KernelImage => 'arch/arm64/boot/Image' }, 'i386' => { DefConfig => 'defconfig', KernelImage => 'arch/x86/boot/bzImage' }, 'amd64' => { DefConfig => 'defconfig', KernelImage => 'arch/x86/boot/bzImage' } }; -- 2.1.4