From patchwork Thu May 15 10:30:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 30246 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D162A202E6 for ; Thu, 15 May 2014 10:32:30 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id i4sf4433444oah.1 for ; Thu, 15 May 2014 03:32:30 -0700 (PDT) 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=rEyjQLAESBEanQiUDyZ+wJrmWk8dujj1aAhYFMk3vbI=; b=YH2mqDcc5GWHbeBo9mcL4+AQxwqs7zFqPJSUi9EonRkFbYHHTMwsE5cqoxuJdOc7RR 2lwDsrmThESdznSc0565SH30m1Zr6G0uy5UX6OHitoUir+JzplGmzLVAST6kPYdQHnfE YFdNN/F7lpI3g52P3/DzQr8GAqPkuRz2LW2Grn4aV25JPm5eqqq06Lu5OoJ2FIE+wJ/V OwP3vd2WjlZduJoWTQ7rPeBemMQhJrnSMa2+NEvraiHCbk02xxHP/qQw++O1/6/BK2ho rlYOFCj6x3u+KAaSeggGkGSt9BOJ7L4l2m8QphWa/Mo5Zo7S7C+0wYxHQHzviEU8mkzy tm8w== X-Gm-Message-State: ALoCoQlQHtcPf5f1bm3bz81zPCDO0mpzj9z/fddNRX1PXMUWnr9O+D/IFL6KMqnySvqPxaz+NeCk X-Received: by 10.182.104.200 with SMTP id gg8mr4651247obb.45.1400149950347; Thu, 15 May 2014 03:32:30 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.23.147 with SMTP id 19ls175886qgp.68.gmail; Thu, 15 May 2014 03:32:30 -0700 (PDT) X-Received: by 10.52.99.168 with SMTP id er8mr6741101vdb.26.1400149950182; Thu, 15 May 2014 03:32:30 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id y10si861716vei.42.2014.05.15.03.32.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 May 2014 03:32:30 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id hu19so4055421vcb.20 for ; Thu, 15 May 2014 03:32:30 -0700 (PDT) X-Received: by 10.52.120.39 with SMTP id kz7mr595995vdb.41.1400149950053; Thu, 15 May 2014 03:32:30 -0700 (PDT) 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.221.72 with SMTP id ib8csp310964vcb; Thu, 15 May 2014 03:32:29 -0700 (PDT) X-Received: by 10.58.182.129 with SMTP id ee1mr2030870vec.14.1400149948961; Thu, 15 May 2014 03:32:28 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id an4si855091vdd.116.2014.05.15.03.32.28 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 15 May 2014 03:32:28 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) 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 1Wksw9-0001kB-QD; Thu, 15 May 2014 10:30:53 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wksw7-0001iQ-Mb for xen-devel@lists.xen.org; Thu, 15 May 2014 10:30:51 +0000 Received: from [85.158.139.211:59193] by server-5.bemta-5.messagelabs.com id E2/F8-06049-A5794735; Thu, 15 May 2014 10:30:50 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1400149847!1561955!2 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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8812 invoked from network); 15 May 2014 10:30:49 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 15 May 2014 10:30:49 -0000 X-IronPort-AV: E=Sophos; i="4.97,1058,1389744000"; d="scan'208"; a="130635082" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 15 May 2014 10:30:42 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Thu, 15 May 2014 06:30:41 -0400 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=zakaz.uk.xensource.com) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1Wksvw-0005kQ-HB; Thu, 15 May 2014 11:30:41 +0100 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Thu, 15 May 2014 11:30:40 +0100 From: Ian Campbell To: , Date: Thu, 15 May 2014 11:30:35 +0100 Message-ID: <1400149839-8489-2-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1400149787.4386.29.camel@kazak.uk.xensource.com> References: <1400149787.4386.29.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell Subject: [Xen-devel] [PATCH OSSTEST v3 2/6] Add a flight to test seabios.org's master branch 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) 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: Most of this is the usual stuff for adding a new branch. cr-daily-branch needed to set REVISION_SEABIOS for the seabios branch and leave it blank for others (so that Config.mk's version will be used). ts-xen-build already consumes the resulting version runvar but needed to be taught about the tree URL runvar. make-flight and mfi-common are updated to only build+test seabios on x86. The new branch is added to cr-daily-branches. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- v3: - ap-push to refs/heads/... v2: - finaled repo names on xenbits as /osstest/seabios.git - stop trying to filter non-qemuu flights, there aren't many and getting the right ones is tricky. --- ap-common | 5 +++++ ap-fetch-version | 4 ++++ ap-fetch-version-old | 5 +++++ ap-print-url | 3 +++ ap-push | 5 +++++ cr-daily-branch | 12 ++++++++++++ cr-for-branches | 2 +- cri-common | 1 + make-flight | 6 ++++++ mfi-common | 5 ++++- ts-xen-build | 3 +++ 11 files changed, 49 insertions(+), 2 deletions(-) diff --git a/ap-common b/ap-common index b475156..36adf68 100644 --- a/ap-common +++ b/ap-common @@ -39,6 +39,10 @@ : ${TREE_GNULIB_LIBVIRT:=git://git.sv.gnu.org/gnulib.git} +: ${TREE_SEABIOS:=git://git.seabios.org/seabios.git} +: ${PUSH_TREE_SEABIOS:=$XENBITS:/home/xen/git/osstest/seabios.git} +: ${BASE_TREE_SEABIOS:=git://xenbits.xen.org/osstest/seabios.git} + : ${TREE_LINUXFIRMWARE:=git://xenbits.xen.org/osstest/linux-firmware.git} : ${PUSH_TREE_LINUXFIRMWARE:=$XENBITS:/home/osstest/ext/linux-firmware.git} : ${UPSTREAM_TREE_LINUXFIRMWARE:=$GIT_KERNEL_ORG/pub/scm/linux/kernel/git/firmware/linux-firmware.git} @@ -64,6 +68,7 @@ fi : ${LOCALREV_LINUX:=daily-cron.$branch} : ${LOCALREV_LIBVIRT:=daily-cron.$branch} : ${LOCALREV_GNULIB_LIBVIRT:=daily-cron.$branch} +: ${LOCALREV_SEABIOS:=daily-cron.$branch} : ${TREEBASE_LINUX_XCP:=http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27} diff --git a/ap-fetch-version b/ap-fetch-version index a4558ea..9f65fca 100755 --- a/ap-fetch-version +++ b/ap-fetch-version @@ -81,6 +81,10 @@ gnulib-libvirt) repo_tree_rev_fetch_git gnulib-libvirt \ $TREE_GNULIB_LIBVIRT master $LOCALREV_GNULIB_LIBVIRT ;; +seabios) + repo_tree_rev_fetch_git seabios \ + $TREE_SEABIOS master $LOCALREV_SEABIOS + ;; osstest) if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then git fetch $HOME/testing.git pretest:ap-fetch >&2 diff --git a/ap-fetch-version-old b/ap-fetch-version-old index 41e3a58..968d4e3 100755 --- a/ap-fetch-version-old +++ b/ap-fetch-version-old @@ -28,6 +28,7 @@ select_xenbranch : ${BASE_TAG_LINUX2639:=tested/2.6.39.x} : ${BASE_LOCALREV_LINUX:=daily-cron.$branch.old} : ${BASE_LOCALREV_LIBVIRT:=daily-cron.$branch.old} +: ${BASE_LOCALREV_SEABIOS:=daily-cron.$branch.old} : ${BASE_TREE_QEMU_UPSTREAM:=${TREE_QEMU_UPSTREAM/\/staging\//\/}} @@ -86,6 +87,10 @@ gnulib-libvirt) # No push gate, same as ap-fetch-version ./ap-fetch-version $branch ;; +seabios) + repo_tree_rev_fetch_git seabios \ + $BASE_TREE_SEABIOS xen-tested-master $BASE_LOCALREV_SEABIOS + ;; osstest) if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then git fetch -f $HOME/testing.git incoming:ap-fetch diff --git a/ap-print-url b/ap-print-url index a21efce..637c9cc 100755 --- a/ap-print-url +++ b/ap-print-url @@ -55,6 +55,9 @@ libvirt) gnulib-libvirt) echo $TREE_GNULIB_LIBVIRT ;; +seabios) + echo $TREE_SEABIOS + ;; osstest) echo none:; ;; diff --git a/ap-push b/ap-push index a9871f7..75be56c 100755 --- a/ap-push +++ b/ap-push @@ -34,6 +34,7 @@ TREE_QEMU_MAINLINE=$PUSH_TREE_QEMU_MAINLINE TREE_QEMU_UPSTREAM=$XENBITS:/home/xen/git/qemu-upstream-${xenbranch#xen-}.git TREE_XEN=$PUSH_TREE_XEN TREE_LIBVIRT=$PUSH_TREE_LIBVIRT +TREE_SEABIOS=$PUSH_TREE_SEABIOS if info_linux_tree "$branch"; then cd $repos/linux @@ -87,6 +88,10 @@ gnulib-libvirt) echo "gnulib-libvirt has not push gate, refusing to push" >&2 exit 1 ;; +seabios) + cd $repos/seabios + git push $TREE_SEABIOS $revision:refs/heads/xen-tested-master + ;; osstest) git push $HOME/testing.git $revision:incoming git push $XENBITS:/home/xen/git/osstest.git $revision:master diff --git a/cr-daily-branch b/cr-daily-branch index 6231256..2cd6470 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -136,6 +136,14 @@ if [ "x$REVISION_LINUX_ARM" = x ]; then export REVISION_LINUX_ARM fi fi +if [ "x$REVISION_SEABIOS" = x ]; then + if [ "x$tree" = "xseabios" ]; then + determine_version REVISION_SEABIOS seabios + export REVISION_SEABIOS + else + : REVISION_SEABIOS from Config.mk + fi +fi if [ "x$REVISION_LIBVIRT" = x ]; then determine_version REVISION_LIBVIRT libvirt export REVISION_LIBVIRT @@ -180,6 +188,10 @@ libvirt) realtree=libvirt NEW_REVISION=$REVISION_LIBVIRT ;; +seabios) + realtree=seabios + NEW_REVISION=$REVISION_SEABIOS + ;; *) NEW_REVISION='' wantpush=false diff --git a/cr-for-branches b/cr-for-branches index bded06f..5ed0a17 100755 --- a/cr-for-branches +++ b/cr-for-branches @@ -31,7 +31,7 @@ scriptoptions="$1"; shift LOGFILE=tmp/cr-for-branches.log export LOGFILE -: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-4.4-testing xen-unstable qemu-mainline qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing linux-3.10 linux-3.4 linux-arm-xen ${EXTRA_BRANCHES}} +: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-4.4-testing xen-unstable qemu-mainline qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing linux-3.10 linux-3.4 linux-arm-xen seabios ${EXTRA_BRANCHES}} export BRANCHES fetchwlem=$wlem diff --git a/cri-common b/cri-common index d901383..b180c4f 100644 --- a/cri-common +++ b/cri-common @@ -49,6 +49,7 @@ select_xenbranch () { linux-*) tree=linux; xenbranch=xen-unstable ;; linuxfirmware) tree=linuxfirmware; xenbranch=xen-unstable ;; libvirt) tree=libvirt; xenbranch=xen-unstable ;; + seabios) tree=seabios; xenbranch=xen-unstable ;; osstest) tree=osstest; xenbranch=xen-unstable ;; esac if [ "x$tree" = xlinux ]; then diff --git a/make-flight b/make-flight index dff82b0..06e4d28 100755 --- a/make-flight +++ b/make-flight @@ -67,6 +67,12 @@ job_create_test_filter_callback () { libvirt) if [ x$toolstack != xlibvirt ] ; then return 1; fi ;; + seabios) + case $xenarch in + amd64|i386) ;; + *) return 1;; + esac + ;; *) case "$job" in *-qemuu-*) diff --git a/mfi-common b/mfi-common index 464001a..8845431 100644 --- a/mfi-common +++ b/mfi-common @@ -52,6 +52,7 @@ create_build_jobs () { linux-mingo-tip-master) continue;; linux-*) ;; qemu-*) continue;; + seabios) continue;; esac case "$xenbranch" in xen-3.*-testing) continue;; @@ -131,12 +132,14 @@ create_build_jobs () { tree_qemu=$TREE_QEMU \ tree_qemuu=$TREE_QEMU_UPSTREAM \ tree_xen=$TREE_XEN \ + tree_seabios=$TREE_SEABIOS \ $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 + revision_qemuu=$REVISION_QEMU_UPSTREAM \ + revision_seabios=$REVISION_SEABIOS if [ $build_extraxend = "true" ] ; then ./cs-job-create $flight build-$arch-xend build \ diff --git a/ts-xen-build b/ts-xen-build index 7ac46ea..5a764fd 100755 --- a/ts-xen-build +++ b/ts-xen-build @@ -67,6 +67,9 @@ END (nonempty($r{revision_qemuu}) ? <>.config QEMU_UPSTREAM_REVISION='$r{revision_qemuu}' END + (nonempty($r{tree_seabios}) ? <>.config SEABIOS_UPSTREAM_URL='$r{tree_seabios}' +END (nonempty($r{revision_seabios}) ? <>.config SEABIOS_UPSTREAM_TAG='$r{revision_seabios}' END