From patchwork Mon Apr 11 16:37:19 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 8804531 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 5FE309F3D1 for ; Mon, 11 Apr 2016 16:50:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9C542202D1 for ; Mon, 11 Apr 2016 16:50:03 +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 CD94120256 for ; Mon, 11 Apr 2016 16:50:02 +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 1apf00-0006SV-JY; Mon, 11 Apr 2016 16:47:40 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1apezz-0006S0-7r for xen-devel@lists.xenproject.org; Mon, 11 Apr 2016 16:47:39 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id FF/58-29636-A25DB075; Mon, 11 Apr 2016 16:47:38 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeJIrShJLcpLzFFi42JxWrrBXlfrKne 4wdHVXBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bdRtaCFu6Ks1va2BoYb3N0MXJySAj4S7zZ eZ0VxGYT0JVo2vKXrYuRg0NEQEXi9l4DEJNZIFRixwtLkAphgSCJmR/XMYLYLAKqEg8efATr5 BXwkLgycxEjxERFie5nE9hAbE4BT4ndk7czg9hCQDVHL81hBBkpJKAmMXd9PESroMTJmU9YQG xmAQmJgy9eMIOUSAhwS/zttp/AyDcLSdUsJFULGJlWMaoXpxaVpRbpmuklFWWmZ5TkJmbm6Bo amOrlphYXJ6an5iQmFesl5+duYgQGEgMQ7GCc2uB8iFGSg0lJlHfnfO5wIb6k/JTKjMTijPii 0pzU4kOMMhwcShK8/FeAcoJFqempFWmZOcCQhklLcPAoifDqg6R5iwsSc4sz0yFSpxgVpcR53 1wGSgiAJDJK8+DaYHF0iVFWSpiXEegQIZ6C1KLczBJU+VeM4hyMSsK8DCDjeTLzSuCmvwJazA S0+Nk/TpDFJYkIKakGxknia64tl9mzvaFx64IQ/r9iT39PeCPoe51HjuF8VdFhmcSWnVvOFHb Pm5Ykd2zfyzKrSrm119PmnJl3R3iLlk8Sd/Tz3Tl5uQsDz+6P9g0UP1P+0ePAn4hH023usrt9 13rRZPZ53dnlHS9+Sc3aoZ9v8tr/lP4FPXmP4EazBXemrmWwE7zO81GJpTgj0VCLuag4EQDZj IMIngIAAA== X-Env-Sender: prvs=902b7e3ca=Ian.Jackson@citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1460393256!33851480!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19034 invoked from network); 11 Apr 2016 16:47:37 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 11 Apr 2016 16:47:37 -0000 X-IronPort-AV: E=Sophos;i="5.24,462,1454976000"; d="scan'208";a="352968043" From: Ian Jackson To: Date: Mon, 11 Apr 2016 17:37:19 +0100 Message-ID: <1460392641-7060-5-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: MIA1 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 4/6] make-flight: Make debian_suite always contain a suite 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 The setting of the suite to "sid" in the snapshot case now occurs in the case at the top of the script. This means that gsuite always contains the actual suite name, and the special cases which set it to sid can be removed. No functional change. Signed-off-by: Ian Jackson --- make-distros-flight | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/make-distros-flight b/make-distros-flight index 060eda3..fa5b71b 100755 --- a/make-distros-flight +++ b/make-distros-flight @@ -34,6 +34,7 @@ defsuite=`getconfig DebianSuite` defguestsuite=`getconfig GuestDebianSuite` case $branch in + distros-debian-snapshot) debian_suite=sid ;; distros-debian-*) debian_suite=${branch#distros-debian-} ;; *) echo $branch >&2; exit 1 ;; esac @@ -68,7 +69,6 @@ test_do_one_netboot () { if [ $branch = distros-debian-snapshot ] ; then diurl="http://d-i.debian.org/daily-images/$domU/daily/netboot" - gsuite=sid gver=daily else #local mirror="http://`getconfig DebianMirrorHost`/`getconfig DebianMirrorSubpath`" @@ -175,7 +175,6 @@ test_matrix_do_one () { test_do_one_netboot if [ $branch = distros-debian-snapshot ]; then - gsuite=sid for cd in current weekly ; do case ${domU}_${gsuite} in armhf_*) continue;; # No iso targets for armhf