From patchwork Wed Jan 22 09:54:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 23499 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f69.google.com (mail-qa0-f69.google.com [209.85.216.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D8EBF218DC for ; Wed, 22 Jan 2014 10:34:49 +0000 (UTC) Received: by mail-qa0-f69.google.com with SMTP id w8sf294598qac.4 for ; Wed, 22 Jan 2014 02:34:49 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=OTJcAo1fz2jrrDnJ2Tgl4ep1qvA1hymG2kyIDb2xYhc=; b=gUjzbgsw8zj8MAw/Uy2HgWTchZnLlPuxbLpYXm5KA4Cd2u7teQE+4Y94+3QfdeBFDw vlj7sk39XYsXECsujo0Th9GfwPxT9Dmr35cRPsoSqnck4J5mAxHYXSRH3HrVUmOOTroc G18VeRpqA60FYPPgJeZIkpQ2mBkKfBgOG60/H0RsFlG17XrYjRZ9UztwIzpmNKUsLp2F pLE6bpzEOunSnvodPU22VrYBpXU2jmJw5Z+9Eit1xYNWXP+kAtnfCe2KgoFcC7InhBeG 2KIpnJZy9XSA68s3bUx5liFbJADnB+JxuTXWgLkc/9mCL4Ob1UEGH4dj9zB31fUWJlo8 0LMA== X-Gm-Message-State: ALoCoQnQZydBInRs5uFIsmugcadT+oNRH1kotXcOsTuvqkP9RmI5FPzfz06A7/vYQDKnkrYQDsnM X-Received: by 10.58.144.41 with SMTP id sj9mr275153veb.8.1390386889137; Wed, 22 Jan 2014 02:34:49 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.21.8 with SMTP id 8ls30641qgk.51.gmail; Wed, 22 Jan 2014 02:34:49 -0800 (PST) X-Received: by 10.59.0.193 with SMTP id ba1mr385800ved.12.1390386888927; Wed, 22 Jan 2014 02:34:48 -0800 (PST) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id h13si4264143vct.143.2014.01.22.02.34.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 22 Jan 2014 02:34:48 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id le5so104962vcb.16 for ; Wed, 22 Jan 2014 02:34:48 -0800 (PST) X-Received: by 10.58.85.133 with SMTP id h5mr388861vez.4.1390386888833; Wed, 22 Jan 2014 02:34:48 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp175634vcz; Wed, 22 Jan 2014 02:34:48 -0800 (PST) X-Received: by 10.42.238.144 with SMTP id ks16mr489360icb.53.1390386887371; Wed, 22 Jan 2014 02:34:47 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id bh7si13444581igc.15.2014.01.22.02.34.46 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 22 Jan 2014 02:34:47 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xen.org designates 50.57.142.19 as permitted sender) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W5uWf-0006gk-Ui; Wed, 22 Jan 2014 09:55:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1W5uWd-0006cQ-HP for xen-devel@lists.xen.org; Wed, 22 Jan 2014 09:55:11 +0000 Received: from [85.158.139.211:7804] by server-14.bemta-5.messagelabs.com id 2A/FE-24200-E759FD25; Wed, 22 Jan 2014 09:55:10 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-206.messagelabs.com!1390384507!8515375!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13529 invoked from network); 22 Jan 2014 09:55:09 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 22 Jan 2014 09:55:09 -0000 X-IronPort-AV: E=Sophos;i="4.95,698,1384300800"; d="scan'208";a="93181290" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 22 Jan 2014 09:55:03 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.2.342.4; Wed, 22 Jan 2014 04:55:02 -0500 Received: from spare.cam.xci-test.com ([10.80.2.80] helo=kazak.uk.xensource.com.) by norwich.cam.xci-test.com with esmtp (Exim 4.72) (envelope-from ) id 1W5uWT-0005Rs-MB; Wed, 22 Jan 2014 09:55:01 +0000 From: Ian Campbell To: Date: Wed, 22 Jan 2014 09:54:48 +0000 Message-ID: <1390384501-20552-4-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1390384419.32519.32.camel@kazak.uk.xensource.com> References: <1390384419.32519.32.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST 04/17] make-flight: refactor build job creation into mfi-common X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: This is pure code motion *except* I have aligned the backslash continuation lines at the same time -- I was unable to resist doing so. Signed-off-by: Ian Campbell --- make-flight | 162 +--------------------------------------------------------- mfi-common | 165 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 161 deletions(-) diff --git a/make-flight b/make-flight index 19f60f1..5136d09 100755 --- a/make-flight +++ b/make-flight @@ -39,167 +39,7 @@ if [ x$buildflight = x ]; then BUILD_RUNVARS+=" build_lvextend_max=$BUILD_LVEXTEND_MAX " fi - for arch in ${BUILD_ARCHES- i386 amd64 armhf }; do - - if [ "x$arch" = xdisable ]; then continue; fi - - 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;; - xen-4.1-testing) continue;; - xen-4.2-testing) continue;; - esac - pvops_kernel=" - tree_linux=$TREE_LINUX_ARM - revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}} - " - pvops_kconfig_overrides=" - kconfig_override_y=CONFIG_EXT4_FS - " - ;; - *) - case "$branch" in - linux-arm-xen) continue;; - esac - pvops_kernel=" - tree_linux=$TREE_LINUX - revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}} - " - ;; - esac - - case "$arch" in - armhf) suite="wheezy";; - *) suite=$defsuite;; - esac - - if [ $suite != $defsuite ] ; then - suite_runvars="host_suite=$suite" - else - suite_runvars= - fi - - # In 4.4 onwards xend is off by default. If necessary we build a - # separate set of binaries with xend enabled in order to run those - # tests which use xend. - case "$arch" in - i386|amd64) want_xend=true;; - *) want_xend=false;; - esac - - case "$xenbranch" in - xen-3.*-testing) build_defxend=$want_xend; build_extraxend=false;; - xen-4.0-testing) build_defxend=$want_xend; build_extraxend=false;; - xen-4.1-testing) build_defxend=$want_xend; build_extraxend=false;; - xen-4.2-testing) build_defxend=$want_xend; build_extraxend=false;; - xen-4.3-testing) build_defxend=$want_xend; build_extraxend=false;; - *) build_defxend=false; - build_extraxend=$want_xend - esac - - case "$xenbranch" in - xen-3.*-testing) enable_ovmf=false;; - xen-4.0-testing) enable_ovmf=false;; - xen-4.1-testing) enable_ovmf=false;; - xen-4.2-testing) enable_ovmf=false;; - xen-4.3-testing) enable_ovmf=false;; - *) enable_ovmf=true; - esac - - eval " - arch_runvars=\"\$ARCH_RUNVARS_$arch\" - " - - build_hostflags=share-build-$suite-$arch,arch-$arch,suite-$suite,purpose-build - - ./cs-job-create $flight build-$arch build \ - arch=$arch enable_xend=$build_defxend enable_ovmf=$enable_ovmf \ - tree_qemu=$TREE_QEMU \ - tree_qemuu=$TREE_QEMU_UPSTREAM \ - tree_xen=$TREE_XEN \ - $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \ - $suite_runvars \ - host_hostflags=$build_hostflags \ - revision_xen=$REVISION_XEN \ - revision_qemu=$REVISION_QEMU \ - revision_qemuu=$REVISION_QEMU_UPSTREAM - - if [ $build_extraxend = "true" ] ; then - ./cs-job-create $flight build-$arch-xend build \ - arch=$arch enable_xend=true enable_ovmf=$enable_ovmf \ - tree_qemu=$TREE_QEMU \ - tree_qemuu=$TREE_QEMU_UPSTREAM \ - tree_xen=$TREE_XEN \ - $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \ - $suite_runvars \ - host_hostflags=$build_hostflags \ - revision_xen=$REVISION_XEN \ - revision_qemu=$REVISION_QEMU \ - revision_qemuu=$REVISION_QEMU_UPSTREAM - fi - - ./cs-job-create $flight build-$arch-pvops build-kern \ - arch=$arch kconfighow=xen-enable-xen-config \ - tree_xen=$TREE_XEN \ - $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_RUNVARS $arch_runvars \ - $suite_runvars \ - host_hostflags=$build_hostflags \ - xen_kernels=linux-2.6-pvops \ - revision_xen=$REVISION_XEN \ - $pvops_kernel $pvops_kconfig_overrides \ - ${TREEVCS_LINUX:+treevcs_linux=}${TREEVCS_LINUX} \ - tree_linuxfirmware=$TREE_LINUXFIRMWARE \ - revision_linuxfirmware=$REVISION_LINUXFIRMWARE - - case "$arch" in - armhf) continue;; # don't do any other kernel builds - esac - - if [ "x$REVISION_LINUX_OLD" != xdisable ]; then - - ./cs-job-create $flight build-$arch-oldkern build \ - arch=$arch \ - tree_qemu=$TREE_QEMU \ - tree_qemuu=$TREE_QEMU_UPSTREAM \ - tree_xen=$TREE_XEN \ - $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_OLD_RUNVARS \ - $arch_runvars $suite_runvars \ - host_hostflags=$build_hostflags \ - xen_kernels=linux-2.6-xen \ - revision_xen=$REVISION_XEN \ - revision_qemu=$REVISION_QEMU \ - revision_qemuu=$REVISION_QEMU_UPSTREAM \ - tree_linux=http://xenbits.xen.org/linux-2.6.18-xen.hg \ - revision_linux=$REVISION_LINUX_OLD - - fi - - if false && [ $arch = i386 -a "x$REVISION_LINUX_XCP" != xdisable ]; then - # XCP dom0 kernel is 32-bit only - - ./cs-job-create $flight build-$arch-xcpkern build-kern \ - $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_XCP_RUNVARS \ - $arch_runvars $suite_runvars \ - arch=$arch \ - kconfighow=intree-buildconfigs kimagefile=arch/x86/boot/vmlinuz \ - host_hostflags=$build_hostflags \ - tree_xen=$TREE_XEN \ - revision_xen=$REVISION_XEN \ - tree_linux=$TREEBASE_LINUX_XCP.hg \ - tree_pq_linux=$TREEBASE_LINUX_XCP.pq.hg \ - revision_linux=$REVISION_LINUX_XCP \ - revision_pq_linux=$REVISION_PQ_LINUX_XCP - - fi - - done + create_build_jobs else diff --git a/mfi-common b/mfi-common index ec0beca..97bc506 100644 --- a/mfi-common +++ b/mfi-common @@ -31,6 +31,171 @@ stripy () { eval "$out_vn=\"\$out_$out_val\"" } +create_build_jobs () { + + for arch in ${BUILD_ARCHES- i386 amd64 armhf }; do + + if [ "x$arch" = xdisable ]; then continue; fi + + 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;; + xen-4.1-testing) continue;; + xen-4.2-testing) continue;; + esac + pvops_kernel=" + tree_linux=$TREE_LINUX_ARM + revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}} + " + pvops_kconfig_overrides=" + kconfig_override_y=CONFIG_EXT4_FS + " + ;; + *) + case "$branch" in + linux-arm-xen) continue;; + esac + pvops_kernel=" + tree_linux=$TREE_LINUX + revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}} + " + ;; + esac + + case "$arch" in + armhf) suite="wheezy";; + *) suite=$defsuite;; + esac + + if [ $suite != $defsuite ] ; then + suite_runvars="host_suite=$suite" + else + suite_runvars= + fi + + # In 4.4 onwards xend is off by default. If necessary we build a + # separate set of binaries with xend enabled in order to run those + # tests which use xend. + case "$arch" in + i386|amd64) want_xend=true;; + *) want_xend=false;; + esac + + case "$xenbranch" in + xen-3.*-testing) build_defxend=$want_xend; build_extraxend=false;; + xen-4.0-testing) build_defxend=$want_xend; build_extraxend=false;; + xen-4.1-testing) build_defxend=$want_xend; build_extraxend=false;; + xen-4.2-testing) build_defxend=$want_xend; build_extraxend=false;; + xen-4.3-testing) build_defxend=$want_xend; build_extraxend=false;; + *) build_defxend=false; + build_extraxend=$want_xend + esac + + case "$xenbranch" in + xen-3.*-testing) enable_ovmf=false;; + xen-4.0-testing) enable_ovmf=false;; + xen-4.1-testing) enable_ovmf=false;; + xen-4.2-testing) enable_ovmf=false;; + xen-4.3-testing) enable_ovmf=false;; + *) enable_ovmf=true; + esac + + eval " + arch_runvars=\"\$ARCH_RUNVARS_$arch\" + " + + build_hostflags=share-build-$suite-$arch,arch-$arch,suite-$suite,purpose-build + + ./cs-job-create $flight build-$arch build \ + arch=$arch enable_xend=$build_defxend enable_ovmf=$enable_ovmf\ + tree_qemu=$TREE_QEMU \ + tree_qemuu=$TREE_QEMU_UPSTREAM \ + tree_xen=$TREE_XEN \ + $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \ + $suite_runvars \ + host_hostflags=$build_hostflags \ + revision_xen=$REVISION_XEN \ + revision_qemu=$REVISION_QEMU \ + revision_qemuu=$REVISION_QEMU_UPSTREAM + + if [ $build_extraxend = "true" ] ; then + ./cs-job-create $flight build-$arch-xend build \ + arch=$arch enable_xend=true enable_ovmf=$enable_ovmf \ + tree_qemu=$TREE_QEMU \ + tree_qemuu=$TREE_QEMU_UPSTREAM \ + tree_xen=$TREE_XEN \ + $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars \ + $suite_runvars \ + host_hostflags=$build_hostflags \ + revision_xen=$REVISION_XEN \ + revision_qemu=$REVISION_QEMU \ + revision_qemuu=$REVISION_QEMU_UPSTREAM + fi + + ./cs-job-create $flight build-$arch-pvops build-kern \ + arch=$arch kconfighow=xen-enable-xen-config \ + tree_xen=$TREE_XEN \ + $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_RUNVARS $arch_runvars \ + $suite_runvars \ + host_hostflags=$build_hostflags \ + xen_kernels=linux-2.6-pvops \ + revision_xen=$REVISION_XEN \ + $pvops_kernel $pvops_kconfig_overrides \ + ${TREEVCS_LINUX:+treevcs_linux=}${TREEVCS_LINUX} \ + tree_linuxfirmware=$TREE_LINUXFIRMWARE \ + revision_linuxfirmware=$REVISION_LINUXFIRMWARE + + case "$arch" in + armhf) continue;; # don't do any other kernel builds + esac + + if [ "x$REVISION_LINUX_OLD" != xdisable ]; then + + ./cs-job-create $flight build-$arch-oldkern build \ + arch=$arch \ + tree_qemu=$TREE_QEMU \ + tree_qemuu=$TREE_QEMU_UPSTREAM \ + tree_xen=$TREE_XEN \ + $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_OLD_RUNVARS \ + $arch_runvars $suite_runvars \ + host_hostflags=$build_hostflags \ + xen_kernels=linux-2.6-xen \ + revision_xen=$REVISION_XEN \ + revision_qemu=$REVISION_QEMU \ + revision_qemuu=$REVISION_QEMU_UPSTREAM \ + tree_linux=http://xenbits.xen.org/linux-2.6.18-xen.hg \ + revision_linux=$REVISION_LINUX_OLD + + fi + + if false && [ $arch = i386 -a "x$REVISION_LINUX_XCP" != xdisable ]; then + # XCP dom0 kernel is 32-bit only + + ./cs-job-create $flight build-$arch-xcpkern build-kern \ + $RUNVARS $BUILD_RUNVARS $BUILD_LINUX_XCP_RUNVARS \ + $arch_runvars $suite_runvars \ + arch=$arch \ + kconfighow=intree-buildconfigs kimagefile=arch/x86/boot/vmlinuz \ + host_hostflags=$build_hostflags \ + tree_xen=$TREE_XEN \ + revision_xen=$REVISION_XEN \ + tree_linux=$TREEBASE_LINUX_XCP.hg \ + tree_pq_linux=$TREEBASE_LINUX_XCP.pq.hg \ + revision_linux=$REVISION_LINUX_XCP \ + revision_pq_linux=$REVISION_PQ_LINUX_XCP + + fi + + done +} + # Local variables: # mode: sh # sh-basic-offset: 2