From patchwork Mon Apr 11 16:37:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 8804301 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 76B63C0553 for ; Mon, 11 Apr 2016 16:40:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 87B7120138 for ; Mon, 11 Apr 2016 16:40:09 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9F0BF201B4 for ; Mon, 11 Apr 2016 16:40:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1apeqq-0005Ae-96; Mon, 11 Apr 2016 16:38:12 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1apeqp-0005A5-71 for xen-devel@lists.xenproject.org; Mon, 11 Apr 2016 16:38:11 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id AE/75-01795-2F2DB075; Mon, 11 Apr 2016 16:38:10 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFuphkeJIrShJLcpLzFFi42JxWrohUvfTJe5 wg/OrWCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oxP624zFqyQrDjS693A2CPcxcjJISHgLzHr 4V0WEJtNQFeiactfti5GDg4RARWJ23sNQExmgVCJHS8sQSqEBaIknm2fwAxiswioSizu3cIEY vMKeEisfbiMCWKiokT3swlsIDangKfE7snbweqFgGqOXprDCDJSSEBNYu76eIhWQYmTM5+AHc AsICFx8MULZogx3BK3T09lnsDINwtJ2SwkZQsYmVYxqhenFpWlFuma6yUVZaZnlOQmZuboGhq Y6uWmFhcnpqfmJCYV6yXn525iBIYSAxDsYDw22fkQoyQHk5Io78753OFCfEn5KZUZicUZ8UWl OanFhxhlODiUJHjtLwLlBItS01Mr0jJzgEENk5bg4FES4X1wASjNW1yQmFucmQ6ROsWoKCXOK wzSJwCSyCjNg2uDRdIlRlkpYV5GoEOEeApSi3IzS1DlXzGKczAqCfPqg0zhycwrgZv+CmgxE9 DiZ/84QRaXJCKkpBoYS5fNdCu+GqBrMtPb53GoReC5jrml3w14b/al5mpZW8Y12hSvWCCu+St 1efQdP1tju3BRnrlcS2bbffpf6uxbFKq07qnzs4aP5aFlutGtOU3/CxO+VRqu/ck8McXmrHXO 0VdLjp8rOb81ha93Qmj9et3Oa2tD6l0D5EVdrlXcsyqxA9r+SYmlOCPRUIu5qDgRAPhmArmfA gAA X-Env-Sender: prvs=902b7e3ca=Ian.Jackson@citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1460392686!21890714!3 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17633 invoked from network); 11 Apr 2016 16:38:09 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-11.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 11 Apr 2016 16:38:09 -0000 X-IronPort-AV: E=Sophos;i="5.24,462,1454976000"; d="scan'208";a="346243932" From: Ian Jackson To: Date: Mon, 11 Apr 2016 17:37:20 +0100 Message-ID: <1460392641-7060-6-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1460392641-7060-1-git-send-email-ian.jackson@eu.citrix.com> References: <1460392641-7060-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 5/6] make-distros-flight: Always set guest_suite and defguestsuite X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Abolish the shell variables $gsuite and $debian_suite (which were referred to only in make-distros-flight) and set and use the variables guest_suite and defguestsuite. These variables are used by the machinery in mfi-common to populate the runvars. No functional change (as seen in standalone-generate-dump-flight-runvars, with mg-list-all-branches edited to use crontab-cambridge). Signed-off-by: Ian Jackson --- make-distros-flight | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/make-distros-flight b/make-distros-flight index fa5b71b..8ab00b1 100755 --- a/make-distros-flight +++ b/make-distros-flight @@ -31,14 +31,15 @@ flight=`./cs-flight-create $blessing $branch` . ./mfi-common defsuite=`getconfig DebianSuite` -defguestsuite=`getconfig GuestDebianSuite` case $branch in - distros-debian-snapshot) debian_suite=sid ;; - distros-debian-*) debian_suite=${branch#distros-debian-} ;; + distros-debian-snapshot) guest_suite=sid ;; + distros-debian-*) guest_suite=${branch#distros-debian-} ;; *) echo $branch >&2; exit 1 ;; esac +defguestsuite=$guest_suite + job_create_build_filter_callback () { local job=$1; shift @@ -74,11 +75,11 @@ test_do_one_netboot () { #local mirror="http://`getconfig DebianMirrorHost`/`getconfig DebianMirrorSubpath`" # XXX local mirror seems to serve up stale files. local mirror="http://ftp.debian.org/debian" - diurl="$mirror/dists/$gsuite/main/installer-$domU/current/images/netboot" - gver=$gsuite + diurl="$mirror/dists/$guest_suite/main/installer-$domU/current/images/netboot" + gver=$guest_suite fi - case ${domU}_${gsuite} in + case ${domU}_${guest_suite} in armhf_squeeze) return;; # No armhf in Squeeze armhf_wheezy) return;; # No armhf guest support in Wheezy *) ;; @@ -96,7 +97,7 @@ test_do_one_netboot () { diurl="$diurl/debian-installer/arm64";; esac - case ${dom0arch}_${domU}_${gsuite} in + case ${dom0arch}_${domU}_${guest_suite} in arm*_arm*_*) bootloader="pygrub";; # no pvgrub for arm # Needs a menu.lst, not present in Squeeze+ due to switch to grub2, @@ -113,7 +114,7 @@ test_do_one_netboot () { test-debian-di xl $xenarch $dom0arch \ kernbuildjob=${bfi}build-$dom0arch-$kernbuild \ debian_arch=$domU \ - debian_suite=$gsuite \ + debian_suite=$guest_suite \ debian_method=netboot \ debian_netboot_kernel="$diurl/vmlinuz" \ debian_netboot_ramdisk="$diurl/initrd.gz" \ @@ -171,12 +172,12 @@ test_matrix_do_one () { for domU in $domUarches ; do - gsuite=$debian_suite + guest_suite=$guest_suite test_do_one_netboot if [ $branch = distros-debian-snapshot ]; then for cd in current weekly ; do - case ${domU}_${gsuite} in + case ${domU}_${guest_suite} in armhf_*) continue;; # No iso targets for armhf *) ;; esac