From patchwork Tue Feb 11 11:13:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 24445 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F1C48203F3 for ; Tue, 11 Feb 2014 11:16:00 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id e16sf16340450qcx.0 for ; Tue, 11 Feb 2014 03:15:59 -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=6oYfhCn4HtHBTR7tNALp1zW2qfCx02EjKNku3LB4JRw=; b=kvEAj7acSgeqXi91HB6fnNW1R4zss3UHg2mG7BNnZUD7E3igh6FnnDvkZWOiX515Wr 31EuKwMcP6O+TxsFGndC888K3jyVlPvvrLQEGL6AYjUHuVYq8qhxzlVw9OIC+y+jh7M+ eCngwilQJLxX4N+hh/2Gc5jKiisqNyYLWVEBG8ZHV0guMp7RUTbAjb/p5Eti09wIa0EW sk/WDlza8T0g/cJ7qf4/iyyviV4gPbdhj/Dc52LeSzE3nZjPYcVCUsKLSkaCtgee25dn Xc7CGskrQ/DhWm6T0N2jUTcnnjlsFCiQnhrhseONjMbOEv2VWe/Rzicy10HvRzD2Sd3c h61A== X-Gm-Message-State: ALoCoQm97d2bh6i4pz7AO+fRoqqWNweNqoro6+3Z01j6SnEuj6UPwFRBk3MgEkYez0PxmGdvcs9J X-Received: by 10.58.136.100 with SMTP id pz4mr14447596veb.26.1392117359737; Tue, 11 Feb 2014 03:15:59 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.94.41 with SMTP id f38ls2335437qge.55.gmail; Tue, 11 Feb 2014 03:15:59 -0800 (PST) X-Received: by 10.220.200.6 with SMTP id eu6mr23806vcb.35.1392117359676; Tue, 11 Feb 2014 03:15:59 -0800 (PST) Received: from mail-vb0-f47.google.com (mail-vb0-f47.google.com [209.85.212.47]) by mx.google.com with ESMTPS id ny8si5773713vcb.144.2014.02.11.03.15.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Feb 2014 03:15:59 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.47 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.47; Received: by mail-vb0-f47.google.com with SMTP id p6so5635385vbe.6 for ; Tue, 11 Feb 2014 03:15:59 -0800 (PST) X-Received: by 10.52.160.233 with SMTP id xn9mr20925vdb.48.1392117359562; Tue, 11 Feb 2014 03:15:59 -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 u4csp238227vcz; Tue, 11 Feb 2014 03:15:59 -0800 (PST) X-Received: by 10.58.186.132 with SMTP id fk4mr27597493vec.9.1392117359023; Tue, 11 Feb 2014 03:15:59 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id go5si5775382vec.109.2014.02.11.03.15.58 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 11 Feb 2014 03:15:59 -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 1WDBHs-0005ZE-1i; Tue, 11 Feb 2014 11:14:00 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WDBHq-0005Z0-NE for xen-devel@lists.xensource.com; Tue, 11 Feb 2014 11:13:58 +0000 Received: from [193.109.254.147:14612] by server-4.bemta-14.messagelabs.com id 10/AF-32066-5F50AF25; Tue, 11 Feb 2014 11:13:57 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1392117235!3506493!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.9.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3573 invoked from network); 11 Feb 2014 11:13:56 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 11 Feb 2014 11:13:56 -0000 X-IronPort-AV: E=Sophos;i="4.95,825,1384300800"; d="scan'208";a="99747515" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 11 Feb 2014 11:13:55 +0000 Received: from [10.80.2.80] (10.80.2.80) by FTLPEX01CL01.citrite.net (10.13.107.78) with Microsoft SMTP Server id 14.2.342.4; Tue, 11 Feb 2014 06:13:55 -0500 Message-ID: <1392117234.26657.87.camel@kazak.uk.xensource.com> From: Ian Campbell To: xen.org Date: Tue, 11 Feb 2014 11:13:54 +0000 In-Reply-To: <1392028633.5117.29.camel@kazak.uk.xensource.com> References: <1392028633.5117.29.camel@kazak.uk.xensource.com> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.4.4-3 MIME-Version: 1.0 X-Originating-IP: [10.80.2.80] X-DLP: MIA1 Cc: xen-devel@lists.xensource.com Subject: Re: [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.47 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 Mon, 2014-02-10 at 10:37 +0000, Ian Campbell wrote: > 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: But I didn't consider {DEFAULT_}REVISION_LINUX{_ARM} and how it interacts: Branch $TREE_LINUX#$REVISION_LINUX $TREE_LINUX_ARM#$R_L_ARM xen-unstable pvops#tested/linux-3.4 pvops#tested/linux-arm-xen linux-linus torvalds#master pvops#XXX linux-arm-xen stefano#master stefano#master osstest pvops#tested/linux-3.4 pvops#tested/linux-arm-xen pvops#XXX == the revision from torvalds#master, but with the pvops tree i.e. the brokeness I started out trying to fix. What this means is that osstest's own push gate is currently blocked because it is trying to test using the standard tree on armhf -- which is a 3.4 tree and has no support for any of the stuff we need. I suspect xen-unstable would also be broken by this (so its good the push gate caught it). One way (to bodge?) around this would be to use $R_L on any branch matching linux-* *except* linux-arm-xen and for anything else to use $R_L_A for (on armhf only of course). This has the affect (I hope) of using the right branch for gating trees like linux-linus and linux-arm-xen but continuing to use the correct tested branch for the arch. But I can't help thinking that this should perhaps be solved further up by e.g. making $TREE_LINUX_ARM#$REVISION_LINUX_ARM be correct for linux-linus -- i.e. by making some change in ap-common:info_linux_tree. I'm not sure what that would look like though -- it might be easiest to thrash this stuff out f2f later. In the meantime here something which I think might fix mfi-common as I described 3 paras ago... Ian. diff --git a/mfi-common b/mfi-common index f7f981e..6ec164e 100644 --- a/mfi-common +++ b/mfi-common @@ -44,10 +44,19 @@ create_build_jobs () { if [ "x$arch" = xdisable ]; then continue; fi + if [ "x$arch" = "xarmhf" ] ; then + echo LINUX $TREE_LINUX \"${REVISION_LINUX}\" \"${DEFAULT_REVISION_LINUX}\" >&2 + echo ARM $TREE_LINUX_ARM \"${REVISION_LINUX_ARM}\" \"${DEFAULT_REVISION_LINUX_ARM}\" >&2 + fi + pvops_kernel=" tree_linux=$TREE_LINUX revision_linux=${REVISION_LINUX:-${DEFAULT_REVISION_LINUX}} " + pvops_kernel_arm=" + tree_linux=$TREE_LINUX_ARM + revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}} + " case "$arch" in armhf) @@ -65,12 +74,12 @@ create_build_jobs () { xen-4.2-testing) continue;; esac - if [ "$branch" = "linux-arm-xen" ]; then - pvops_kernel=" - tree_linux=$TREE_LINUX_ARM - revision_linux=${REVISION_LINUX_ARM:-${DEFAULT_REVISION_LINUX_ARM}} - " - fi + case $branch in + linux-arm-xen) pvops_kernel="$pvops_kernel_arm" ;; + linux-*) ;; # Apart from linux-arm-xen these should test mainline kernels + *) pvops_kernel="$pvops_kernel_arm" ;; + esac + pvops_kconfig_overrides=" kconfig_override_y=CONFIG_EXT4_FS "