From patchwork Wed Jun 4 13:12:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 31355 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BF461203AC for ; Wed, 4 Jun 2014 13:14:17 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id pa12sf37427152veb.3 for ; Wed, 04 Jun 2014 06:14:14 -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 :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=UFaqLuc/I1vugKtPYjpsndz3jn8RuWDCWctqO3BXbEk=; b=g+qN+3F9zgHzw97gS08G1cDwEAf6QhduX/Xzi0GkZWbRcfFZnZvAyMaoCcDphm5H71 2vC3xaiGaxW8kntogvr90sSKwUFpsW9/boQE3Wo5LLkyul9nkKCogNktCutHqXdQnVq8 ut1LSU5ZrMlyGDNog1vKU6UAP+uSgePzb6EBRpaW+l0UV/bDhlJYW2yOjySmtSOy34JH W7GZzygj8+UPY5bMSogwFuG2dzxCdZNfDl44+pfHFCBdt9itjU6d2pLWAhPopCtF/BVi IWQ25dpjpGnkUaj2237+ZpxX98mxUTYwOlKEeHgt6leqZZI/rh9CQ37HeScTevc070VB iaMg== X-Gm-Message-State: ALoCoQmjHflP7FkWQKnbHVUkRHf+jw3GNUt3IHsHPvSqX0LOriWGYgit+OuPOQZkaaOr3VH2H0JY X-Received: by 10.224.147.72 with SMTP id k8mr19391777qav.5.1401887654410; Wed, 04 Jun 2014 06:14:14 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.95.232 with SMTP id i95ls2923658qge.7.gmail; Wed, 04 Jun 2014 06:14:14 -0700 (PDT) X-Received: by 10.58.182.129 with SMTP id ee1mr44039625vec.14.1401887654283; Wed, 04 Jun 2014 06:14:14 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id aa6si1525316vec.66.2014.06.04.06.14.14 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 04 Jun 2014 06:14:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.177 as permitted sender) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id db11so8618855veb.8 for ; Wed, 04 Jun 2014 06:14:14 -0700 (PDT) X-Received: by 10.53.10.234 with SMTP id ed10mr1643955vdd.86.1401887654020; Wed, 04 Jun 2014 06:14:14 -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.221.54.6 with SMTP id vs6csp44014vcb; Wed, 4 Jun 2014 06:14:13 -0700 (PDT) X-Received: by 10.224.43.211 with SMTP id x19mr73284724qae.17.1401887653489; Wed, 04 Jun 2014 06:14:13 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id o97si3519848qga.48.2014.06.04.06.14.13 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 04 Jun 2014 06:14:13 -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 1WsAzI-0000ET-BS; Wed, 04 Jun 2014 13:12:16 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WsAzH-0000E6-D6 for xen-devel@lists.xen.org; Wed, 04 Jun 2014 13:12:15 +0000 Received: from [85.158.137.68:48291] by server-15.bemta-3.messagelabs.com id BE/BF-13757-E2B1F835; Wed, 04 Jun 2014 13:12:14 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1401887531!7970292!2 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 18011 invoked from network); 4 Jun 2014 13:12:13 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 4 Jun 2014 13:12:13 -0000 X-IronPort-AV: E=Sophos;i="4.98,973,1392163200"; d="scan'208";a="139472162" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 04 Jun 2014 13:12:11 +0000 Received: from norwich.cam.xci-test.com (10.80.248.129) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Wed, 4 Jun 2014 09:12:10 -0400 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 1WsAzC-0002fO-6N; Wed, 04 Jun 2014 13:12:10 +0000 From: Ian Campbell To: Date: Wed, 4 Jun 2014 14:12:09 +0100 Message-ID: <1401887529-13241-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.9.0 MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST 3/3] cr-daily-branch: Fix URLs used for trees which should be using push gate output 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.177 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: For several trees we were using the upstream URL for tests of all branches when we should have been using the push gate output on xenbits (to help isolate us from external failures). i.e. tree_libvirt was git://libvirt.org/libvirt.git for every branch but for branches other than libvirt it should be git://xenbits.xen.org/libvirt.git. This is down to a missing third argument to determine_version. Fix this for all but osstest (which shouldn't be touched). Tested with: $ BRANCHES="xen-unstable libvirt rumpuserxen seabios qemu-mainline qemu-xen-unstable linux-next linuxfirmware osstest" $ for b in $BRANCHES ; do f=T${b//-}; ./standalone make-flight -f $f $b; done $ check() { \ f=T${1//-} ; \ echo $1 ; \ ./mg-show-flight-runvars $f | \ awk '$2 ~ /^tree_/ && $3 !~ /^$|xenbits.xen.org/ { printf " %-28s %s\n", $2, $3 }' | \ sort -u; \ } $ for b in xen-unstable libvirt rumpuserxen seabios qemu-mainline qemu-xen-unstable linux-next osstest ; do check $b; done Which produces: xen-unstable tree_gnulib_libvirt git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try] tree_rumpuserxen_rumpsrc https://github.com/rumpkernel/rumpkernel-netbsd-src libvirt tree_gnulib_libvirt git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try] tree_libvirt git://libvirt.org/libvirt.git tree_rumpuserxen_rumpsrc https://github.com/rumpkernel/rumpkernel-netbsd-src rumpuserxen tree_rumpuserxen https://github.com/rumpkernel/rumpuser-xen tree_rumpuserxen_rumpsrc https://github.com/rumpkernel/rumpkernel-netbsd-src seabios tree_gnulib_libvirt git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try] tree_rumpuserxen_rumpsrc https://github.com/rumpkernel/rumpkernel-netbsd-src tree_seabios git://git.seabios.org/seabios.git qemu-mainline tree_gnulib_libvirt git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try] tree_qemuu git://git.qemu.org/qemu.git tree_rumpuserxen_rumpsrc https://github.com/rumpkernel/rumpkernel-netbsd-src qemu-xen-unstable linux-next tree_gnulib_libvirt git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try] tree_linux git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git tree_rumpuserxen_rumpsrc https://github.com/rumpkernel/rumpkernel-netbsd-src linuxfirmware tree_gnulib_libvirt git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try] tree_rumpuserxen_rumpsrc https://github.com/rumpkernel/rumpkernel-netbsd-src osstest tree_gnulib_libvirt git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try] tree_rumpuserxen_rumpsrc https://github.com/rumpkernel/rumpkernel-netbsd-src The presence of tree_gnulib_libvirt is expected while the tree_rumpuserxen_rumpsrc is erroneous (I think) but not intended to be fixed here. Note that linuxfirmware is broken since tree_linuxfirmware should be $GIT_KERNEL_ORG/pub/scm/linux/kernel/git/firmware/linux-firmware.git. This is also not addressed here. For comparison the xen-unstable check output prior to this fix was: xen-unstable tree_gnulib_libvirt git://drall.uk.xensource.com:9419/git://git.sv.gnu.org/gnulib.git%20[fetch=try] tree_libvirt git://libvirt.org/libvirt.git tree_rumpuserxen https://github.com/rumpkernel/rumpuser-xen tree_rumpuserxen_rumpsrc https://github.com/rumpkernel/rumpkernel-netbsd-src Note the incorrect tree_libvirt and tree_rumpuserxen. Signed-off-by: Ian Campbell --- cr-daily-branch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cr-daily-branch b/cr-daily-branch index 1514397..90eb499 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -140,26 +140,26 @@ if [ "x$REVISION_SEABIOS" = x ]; then if [ "x$tree" = "xseabios" ]; then TREE_SEABIOS=$TREE_SEABIOS_UPSTREAM export TREE_SEABIOS - determine_version REVISION_SEABIOS seabios + determine_version REVISION_SEABIOS seabios SEABIOS export REVISION_SEABIOS else : REVISION_SEABIOS from Config.mk fi fi if [ "x$REVISION_LIBVIRT" = x ]; then - determine_version REVISION_LIBVIRT libvirt + determine_version REVISION_LIBVIRT libvirt LIBVIRT export REVISION_LIBVIRT fi if [ "x$REVISION_GNULIB_LIBVIRT" = x ]; then - determine_version REVISION_GNULIB_LIBVIRT gnulib-libvirt + determine_version REVISION_GNULIB_LIBVIRT gnulib-libvirt GNULIB_LIBVIRT export REVISION_GNULIB_LIBVIRT fi if [ "x$REVISION_RUMPUSERXEN" = x ]; then - determine_version REVISION_RUMPUSERXEN rumpuserxen + determine_version REVISION_RUMPUSERXEN rumpuserxen RUMPUSERXEN export REVISION_RUMPUSERXEN fi if [ "x$REVISION_LINUXFIRMWARE" = x ]; then - determine_version REVISION_LINUXFIRMWARE linuxfirmware + determine_version REVISION_LINUXFIRMWARE linuxfirmware LINUXFIRMWARE export REVISION_LINUXFIRMWARE fi