From patchwork Mon Feb 10 10:37:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 24402 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f198.google.com (mail-vc0-f198.google.com [209.85.220.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4E18820567 for ; Mon, 10 Feb 2014 10:39:27 +0000 (UTC) Received: by mail-vc0-f198.google.com with SMTP id lf12sf14296704vcb.5 for ; Mon, 10 Feb 2014 02:39:26 -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:message-id:from:to:date:in-reply-to :references:organization: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=9ylx9rEWX0JDuX3oTWFi6gr/fE7PSXGs2eYKTfh8+bo=; b=UUpkbszkGkBsgiK5rGwXNH6tJ+rGm5MFvSfv3SLfKqprnLXmw+hSQjAbJcIrJn/jRB XoL/uuvmTd7cm1zR70OcUY9ZteIaRlCbqpRfmImM2TOv4K7HYBlPnA8SwbU58EHF1by0 i0L0YozlRACIXfia+3a9P++gs8Mw4jiVZh6PbNv8i4Od3UiU8JwKVnePSQpGRUajaEzE NCMZWbCmOlmpOA+WbcA+ZDDkUwF8KJC4eLEvw0FhTcuswg1rMeDWXdhZMb29iI8Kkj88 G8WFjf6tpAfg9H9H5BnPg/DIeNtBWGsNfRjvzz/3OI6MUyoGUIGdTnEe/LUcZGNGFA6C f37A== X-Gm-Message-State: ALoCoQmadtyUAhDXPaGikNiRVd/P/a/V4E5sOgdunc6GUIpP1SclxTOISmMmeFG/rXiAw5AVjKYD X-Received: by 10.236.94.113 with SMTP id m77mr9805402yhf.33.1392028766168; Mon, 10 Feb 2014 02:39:26 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.129 with SMTP id g1ls1993075qge.69.gmail; Mon, 10 Feb 2014 02:39:26 -0800 (PST) X-Received: by 10.52.110.201 with SMTP id ic9mr19535165vdb.22.1392028766050; Mon, 10 Feb 2014 02:39:26 -0800 (PST) Received: from mail-vb0-f41.google.com (mail-vb0-f41.google.com [209.85.212.41]) by mx.google.com with ESMTPS id nc1si4674608vec.24.2014.02.10.02.39.26 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Feb 2014 02:39:26 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.41 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.41; Received: by mail-vb0-f41.google.com with SMTP id g10so4708475vbg.0 for ; Mon, 10 Feb 2014 02:39:26 -0800 (PST) X-Received: by 10.58.69.111 with SMTP id d15mr23134185veu.3.1392028765949; Mon, 10 Feb 2014 02:39:25 -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 u4csp157973vcz; Mon, 10 Feb 2014 02:39:25 -0800 (PST) X-Received: by 10.221.66.73 with SMTP id xp9mr634213vcb.27.1392028765476; Mon, 10 Feb 2014 02:39:25 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id w6si4674494vcz.8.2014.02.10.02.39.24 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 10 Feb 2014 02:39:25 -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 1WCoEq-0003tw-3x; Mon, 10 Feb 2014 10:37:20 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WCoEo-0003th-7x for xen-devel@lists.xensource.com; Mon, 10 Feb 2014 10:37:18 +0000 Received: from [193.109.254.147:56715] by server-16.bemta-14.messagelabs.com id 12/CF-21945-DDBA8F25; Mon, 10 Feb 2014 10:37:17 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1392028635!3212107!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.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 20768 invoked from network); 10 Feb 2014 10:37:16 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 10 Feb 2014 10:37:16 -0000 X-IronPort-AV: E=Sophos;i="4.95,817,1384300800"; d="scan'208";a="101262985" Received: from accessns.citrite.net (HELO FTLPEX01CL03.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 10 Feb 2014 10:37:15 +0000 Received: from [10.80.2.80] (10.80.2.80) by FTLPEX01CL03.citrite.net (10.13.107.80) with Microsoft SMTP Server id 14.2.342.4; Mon, 10 Feb 2014 05:37:14 -0500 Message-ID: <1392028633.5117.29.camel@kazak.uk.xensource.com> From: Ian Campbell To: xen.org Date: Mon, 10 Feb 2014 10:37:13 +0000 In-Reply-To: References: Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.4-3 MIME-Version: 1.0 X-Originating-IP: [10.80.2.80] X-DLP: MIA2 Cc: xen-devel@lists.xensource.com Subject: [Xen-devel] [PATCH OSSTEST] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch (Was: Re: [linux-linus test] 24817: regressions - FAIL) 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.212.41 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: On Sun, 2014-02-09 at 16:04 +0000, xen.org wrote: > > build-armhf-pvops 4 kernel-build fail never pass + git checkout 494479038d97f1b9f76fc633a360a681acdf035c fatal: reference is not a tree: 494479038d97f1b9f76fc633a360a681acdf035c This is because it is using git://xenbits.xen.org/linux-pvops.git instead of the tree it should be testing... The following fixes it for me, but although the results are as I wanted I'm not 100% sure about this override in the first place. In my experiments with cr-daily-branch I see: Branch $TREE_LINUX $TREE_LINUX_ARM xen-unstable pvops pvops linux-linus torvalds pvops linux-arm-xen arm-xen arm-xen Key: [arm-xen] git://git.kernel.org/pub/scm/linux/kernel/git/sstabellini/xen.git [torvalds] git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git [pvops] git://xenbits.xen.org/linux-pvops.git IOW $TREE_LINUX is always correct. When invoking make-flight directly both are always "pvops". 8<--------------------------------------- >From 344b0ca5e623d8212ee9d5452f19aba2df2c97fe Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 10 Feb 2014 09:33:00 +0000 Subject: [PATCH] mfi-common: Only override the pvops kernel repo for linux-arm-xen branch Otherwise e.g. linux-linus tries to use the wrong tree and fails. I have confirmed that for flights on xen-unstable, linux-linus and linux-arm-xen the only difference in the runvars is linux-linux.build-armhf-pvops.tree_linus which changes from git://xenbits.xen.org/linux-pvops.git to git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git as expected. Signed-off-by: Ian Campbell --- mfi-common | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/mfi-common b/mfi-common index 8f56092..f7f981e 100644 --- a/mfi-common +++ b/mfi-common @@ -44,6 +44,11 @@ create_build_jobs () { if [ "x$arch" = xdisable ]; then continue; fi + pvops_kernel=" + tree_linux=$TREE_LINUX + revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}} + " + case "$arch" in armhf) case "$branch" in @@ -59,10 +64,13 @@ create_build_jobs () { 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}} - " + + if [ "$branch" = "linux-arm-xen" ]; then + pvops_kernel=" + tree_linux=$TREE_LINUX_ARM + revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}} + " + fi pvops_kconfig_overrides=" kconfig_override_y=CONFIG_EXT4_FS " @@ -71,10 +79,6 @@ create_build_jobs () { case "$branch" in linux-arm-xen) continue;; esac - pvops_kernel=" - tree_linux=$TREE_LINUX - revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}} - " ;; esac