From patchwork Thu May 15 10:30:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 30247 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 44FB5202E6 for ; Thu, 15 May 2014 10:32:32 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id i4sf4421035oah.9 for ; Thu, 15 May 2014 03:32:31 -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=qr0TyBXxIPLKQ1L3gxnewejAn8OUsbLaIo2N2M+qWe0=; b=CYHwMIZE0znFFH92YDEcI+1tgFdvokejdhegeRoZUJj2KDBpuTK9DZOI/kPBBz0ZIp 1QdrEOUIjLseDP8axB8HGhZuqrNepXgpN8xkst1q+wZkke6UQldf85Wxikt7DSh+yKyh 63XgBPxQtBI/oVioE6PDSsjcKYobeleL1gK2XCudqds7SKHDvpV41VxdBwBLtoQOEoPH UQ8FsfDl1pCOgnaTHg0oR6/mhXh/H0J66IIAbkKGnCG39L1UrK+vL6JKpcg7BBq7qu4N jsFbuuwVSvzdTMImFZHMzrHHNbA+qk5nlS7XIWGthBLegmWmBfKmruy+EYIoPkHtayIe WS6Q== X-Gm-Message-State: ALoCoQmqmHsl1nEe4Knm0TliJTS2e67xfnIwx6OEQ4PQOUrvcvbykhH7ZrSn1zaVKmBSHj7mqJOZ X-Received: by 10.182.19.35 with SMTP id b3mr4736904obe.12.1400149951891; Thu, 15 May 2014 03:32:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.91.99 with SMTP id y90ls159422qgd.82.gmail; Thu, 15 May 2014 03:32:31 -0700 (PDT) X-Received: by 10.52.13.41 with SMTP id e9mr6710841vdc.21.1400149951771; Thu, 15 May 2014 03:32:31 -0700 (PDT) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by mx.google.com with ESMTPS id v2si862532vet.34.2014.05.15.03.32.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 May 2014 03:32:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.173 as permitted sender) client-ip=209.85.128.173; Received: by mail-ve0-f173.google.com with SMTP id pa12so994868veb.4 for ; Thu, 15 May 2014 03:32:31 -0700 (PDT) X-Received: by 10.58.198.107 with SMTP id jb11mr8103131vec.10.1400149951664; Thu, 15 May 2014 03:32:31 -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 ib8csp310966vcb; Thu, 15 May 2014 03:32:31 -0700 (PDT) X-Received: by 10.58.220.161 with SMTP id px1mr8090181vec.13.1400149950672; Thu, 15 May 2014 03:32:30 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id f2si854860vem.171.2014.05.15.03.32.30 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 15 May 2014 03:32:30 -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 1Wksw7-0001id-Ua; Thu, 15 May 2014 10:30:51 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wksw6-0001hH-7D for xen-devel@lists.xen.org; Thu, 15 May 2014 10:30:50 +0000 Received: from [85.158.139.211:24006] by server-17.bemta-5.messagelabs.com id 85/F1-09046-95794735; Thu, 15 May 2014 10:30:49 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1400149847!1561955!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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 8569 invoked from network); 15 May 2014 10:30:48 -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:48 -0000 X-IronPort-AV: E=Sophos; i="4.97,1058,1389744000"; d="scan'208"; a="130635080" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 15 May 2014 10:30:41 +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:40 -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 1Wksvv-0005kO-GA; Thu, 15 May 2014 11:30:40 +0100 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Thu, 15 May 2014 11:30:39 +0100 From: Ian Campbell To: , Date: Thu, 15 May 2014 11:30:34 +0100 Message-ID: <1400149839-8489-1-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: MIA2 Cc: Ian Campbell Subject: [Xen-devel] [PATCH OSSTEST v3 1/6] Add a flight to test qemu.org's ("mainline") 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.128.173 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: The naming here is slightly confused because we call our branches of qemuu on xenbits "qemu-upstream-foo", so I went with qemu-mainline to be distinct. I've introduced $qemuubranch along the lines of $xenbranch, it is normally set to qemu-upstream-{X.Y,unstable} but for the qemu-mainline flight it instead points to qemu-mainline. I've run up to the make-flight bit of cr-daily-branch and it differs only in the expected ways from a standard xen-unstable branch (i.e. uses xen.git#master and qemu.git#master). I did consider causing make-flight:job_create_test_filter_callback to omit any test which didn't use qemuu but I decided not to because it is used for PV qdisk backends too. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- v3: - Output tree is now osstest/qemu.git#mainline/xen-tested-master - ap-push to refs/heads/... - adjust crm-daily-branch to pick the correct TREE_QEMU_UPSTREAM when testing mainline. v2: - Finalised repo names on xenbits as /osstest/qemu-mainline.git (and removed associated changelog comment about not being sure) - Removed wanderings about qemu-upstream filtering from commit log too. --- ap-common | 5 +++++ ap-fetch-version | 4 ++++ ap-fetch-version-old | 4 ++++ ap-print-url | 3 +++ ap-push | 5 +++++ cr-daily-branch | 9 ++++++--- cr-for-branches | 2 +- cri-common | 4 ++++ 8 files changed, 32 insertions(+), 4 deletions(-) diff --git a/ap-common b/ap-common index ed37811..b475156 100644 --- a/ap-common +++ b/ap-common @@ -70,6 +70,11 @@ fi : ${TREE_QEMU_UPSTREAM:=git://xenbits.xen.org/staging/qemu-upstream-${xenbranch#xen-}.git} : ${LOCALREV_QEMU_UPSTREAM:=daily-cron.$branch} +: ${TREE_QEMU_MAINLINE:=git://git.qemu.org/qemu.git} +: ${BASE_TREE_QEMU_MAINLINE:=git://xenbits.xen.org/osstest/qemu.git} +: ${PUSH_TREE_QEMU_MAINLINE:=$XENBITS:/home/xen/git/osstest/qemu.git} +: ${LOCALREV_QEMU_MAINLINE:=daily-cron.$branch} + info_linux_tree () { case $1 in diff --git a/ap-fetch-version b/ap-fetch-version index 7cc2d98..a4558ea 100755 --- a/ap-fetch-version +++ b/ap-fetch-version @@ -49,6 +49,10 @@ xen-4.*-testing) repo_tree_rev_fetch_git xen \ $TREE_XEN staging-$branchcore $LOCALREV_XEN ;; +qemu-mainline) + repo_tree_rev_fetch_git $branch \ + $TREE_QEMU_MAINLINE master $LOCALREV_QEMU_UPSTREAM + ;; qemu-upstream-*) repo_tree_rev_fetch_git $branch \ $TREE_QEMU_UPSTREAM master $LOCALREV_QEMU_UPSTREAM diff --git a/ap-fetch-version-old b/ap-fetch-version-old index 3879e09..41e3a58 100755 --- a/ap-fetch-version-old +++ b/ap-fetch-version-old @@ -54,6 +54,10 @@ xen-4.*-testing) repo_tree_rev_fetch_git xen \ $TREE_XEN stable-$branchcore $LOCALREV_XEN ;; +qemu-mainline) + repo_tree_rev_fetch_git $branch \ + $BASE_TREE_QEMU_MAINLINE mainline/xen-tested-master $LOCALREV_QEMU_MAINLINE + ;; qemu-upstream-*) repo_tree_rev_fetch_git $branch \ $BASE_TREE_QEMU_UPSTREAM master $LOCALREV_QEMU_UPSTREAM diff --git a/ap-print-url b/ap-print-url index b1af0b9..a21efce 100755 --- a/ap-print-url +++ b/ap-print-url @@ -34,6 +34,9 @@ case "$branch" in xen*) echo $TREE_XEN ;; +qemu-mainline) + echo $TREE_QEMU_MAINLINE + ;; qemu-upstream-*) echo $TREE_QEMU_UPSTREAM ;; diff --git a/ap-push b/ap-push index 674559f..a9871f7 100755 --- a/ap-push +++ b/ap-push @@ -30,6 +30,7 @@ select_xenbranch . ap-common TREE_LINUX=$PUSH_TREE_LINUX +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 @@ -57,6 +58,10 @@ xen-*-testing) xenversion=${xenversion#xen-} git push $TREE_XEN $revision:stable-$xenversion ;; +qemu-mainline) + cd $repos/qemu-mainline + git push $TREE_QEMU_MAINLINE $revision:refs/heads/mainline/xen-tested-master + ;; qemu-upstream-*) cd $repos/$branch git push $TREE_QEMU_UPSTREAM $revision:master diff --git a/cr-daily-branch b/cr-daily-branch index 0cafe39..6231256 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -111,8 +111,11 @@ if [ "x$REVISION_QEMU_UPSTREAM" = x ]; then xen-3.*|xen-4.[01]-*) ;; *) - REVISION_QEMU_UPSTREAM="`fetch_version \ - qemu-upstream-${xenbranch#xen-}`" + if [ "x$qemuubranch" = "xqemu-mainline" ] ; then + TREE_QEMU_UPSTREAM=$TREE_QEMU_MAINLINE + export TREE_QEMU_UPSTREAM + fi + REVISION_QEMU_UPSTREAM="`fetch_version $qemuubranch`" ;; esac export REVISION_QEMU_UPSTREAM @@ -166,7 +169,7 @@ osstest) fi ;; qemuu) - realtree=qemu-upstream-${xenbranch#xen-} + realtree=$qemuubranch NEW_REVISION=$REVISION_QEMU_UPSTREAM ;; linuxfirmware) diff --git a/cr-for-branches b/cr-for-branches index 60611d1..bded06f 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-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 ${EXTRA_BRANCHES}} export BRANCHES fetchwlem=$wlem diff --git a/cri-common b/cri-common index d82312c..d901383 100644 --- a/cri-common +++ b/cri-common @@ -43,6 +43,7 @@ repo_tree_rev_fetch_git () { select_xenbranch () { case "$branch" in xen*) tree=xen; xenbranch=$branch ;; + qemu-mainline) tree=qemuu; xenbranch=xen-unstable qemuubranch=qemu-mainline;; qemu-upstream-*) tree=qemuu; xenbranch=xen-${branch#qemu-upstream-};; linux) tree=linux; xenbranch=xen-unstable ;; linux-*) tree=linux; xenbranch=xen-unstable ;; @@ -55,6 +56,9 @@ select_xenbranch () { else linuxbranch='' fi + if [ x$qemuubranch = x ]; then + qemuubranch="qemu-upstream-${xenbranch#xen-}" + fi } select_branch () {