From patchwork Mon May 12 12:39: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: 29974 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AF1B6238EB for ; Mon, 12 May 2014 12:41:26 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id db11sf25856739veb.0 for ; Mon, 12 May 2014 05:41:26 -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=hYQAK4OJ6zUHzQOP5fNiwMQks091ZDRBANRIla2zKeo=; b=KkwaN6q7vwlrb9Vd8BAiL/Hk+041J62qB6RwivboQCsyjYEp3TlmBEEvJVpYMPWWQP rewvB5Z/i+2YdriTyuAJXRembq801BVQfwg9OHceZW25o66xcbfPnK2+u6GB1+Uj/mp5 aIEN2iLHXhSrqDgAqVQpawSkWbSA63yISn63v1yY4UCDuEbwvm/HGDiU6jfPYuoD9wcZ Dtlw7miufdlidsKyL/ZwbR3iz2qZz/XQHdvWaEge2Uot8TsFpM5mx56lGexzZd4xGYPo QQyuon9wqSK3LyRu1/6lt8gtU1woCMjZ6jT5daqVCkO7KpjTbh0tR/aJVYEFxHnIROTS QGzA== X-Gm-Message-State: ALoCoQkX7u8A7hlJHP9rCx44aDQVg305alGTTRBMZDDsjEGgbezegzMB7ZijI0fFkz/rKTfBMnnI X-Received: by 10.236.130.101 with SMTP id j65mr11524562yhi.29.1399898486526; Mon, 12 May 2014 05:41:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.40 with SMTP id m37ls1375397qgd.18.gmail; Mon, 12 May 2014 05:41:26 -0700 (PDT) X-Received: by 10.58.22.38 with SMTP id a6mr365434vef.58.1399898486406; Mon, 12 May 2014 05:41:26 -0700 (PDT) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by mx.google.com with ESMTPS id k20si2052030vcm.97.2014.05.12.05.41.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 12 May 2014 05:41:26 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.169 as permitted sender) client-ip=209.85.220.169; Received: by mail-vc0-f169.google.com with SMTP id ij19so8868889vcb.0 for ; Mon, 12 May 2014 05:41:26 -0700 (PDT) X-Received: by 10.221.62.131 with SMTP id xa3mr22997120vcb.13.1399898486303; Mon, 12 May 2014 05:41:26 -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 ib8csp65816vcb; Mon, 12 May 2014 05:41:25 -0700 (PDT) X-Received: by 10.224.161.10 with SMTP id p10mr38403634qax.12.1399898485469; Mon, 12 May 2014 05:41:25 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id x7si5896115qaj.209.2014.05.12.05.41.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 12 May 2014 05:41:25 -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 1WjpWA-0004Jv-Do; Mon, 12 May 2014 12:39:42 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WjpW9-0004Jk-2Z for xen-devel@lists.xen.org; Mon, 12 May 2014 12:39:41 +0000 Received: from [85.158.139.211:13911] by server-12.bemta-5.messagelabs.com id 7D/40-03824-C01C0735; Mon, 12 May 2014 12:39:40 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-2.tower-206.messagelabs.com!1399898378!3688536!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20824 invoked from network); 12 May 2014 12:39:39 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-2.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 12 May 2014 12:39:39 -0000 X-IronPort-AV: E=Sophos; i="4.97,1035,1389744000"; d="scan'208"; a="130148087" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 12 May 2014 12:39:37 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Mon, 12 May 2014 08:39:37 -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 1WjpW3-0001Kx-VQ; Mon, 12 May 2014 13:39:36 +0100 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Mon, 12 May 2014 13:39:35 +0100 From: Ian Campbell To: , Date: Mon, 12 May 2014 13:39:34 +0100 Message-ID: <1399898375-5057-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1399898349.4428.9.camel@kazak.uk.xensource.com> References: <1399898349.4428.9.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell Subject: [Xen-devel] [PATCH OSSTEST RFC v2 1/2] 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.220.169 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 --- 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 | 5 ++--- cr-for-branches | 2 +- cri-common | 4 ++++ 8 files changed, 28 insertions(+), 4 deletions(-) diff --git a/ap-common b/ap-common index ed37811..0969ab3 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-mainline.git} +: ${PUSH_TREE_QEMU_MAINLINE:=$XENBITS:/home/xen/git/osstest/qemu-mainline.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..f71626f 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 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..00e0d8b 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: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..837cf7a 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -111,8 +111,7 @@ if [ "x$REVISION_QEMU_UPSTREAM" = x ]; then xen-3.*|xen-4.[01]-*) ;; *) - REVISION_QEMU_UPSTREAM="`fetch_version \ - qemu-upstream-${xenbranch#xen-}`" + REVISION_QEMU_UPSTREAM="`fetch_version $qemuubranch`" ;; esac export REVISION_QEMU_UPSTREAM @@ -166,7 +165,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 () {