From patchwork Mon Apr 11 16:37:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 8804291 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 C70F6C0553 for ; Mon, 11 Apr 2016 16:40:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DA45C20270 for ; Mon, 11 Apr 2016 16:40:07 +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 141322022A for ; Mon, 11 Apr 2016 16:40:07 +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 1apeqp-0005A8-22; Mon, 11 Apr 2016 16:38:11 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1apeqn-00059b-Vb for xen-devel@lists.xenproject.org; Mon, 11 Apr 2016 16:38:10 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 5C/41-30904-1F2DB075; Mon, 11 Apr 2016 16:38:09 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupmkeJIrShJLcpLzFFi42JxWrohUvfjJe5 wg9PzhC2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ox9/7+wFPzjqFi13K+BcSZ7FyMnh4SAv8TF ht1MIDabgK5E05a/bF2MHBwiAioSt/cagJjMAqESO15YglQIC0RKPG/uYQUJswioSuzYBRbmF fCQ+Pd7MTPEQEWJ7mcT2EBsTgFPid2Tt4PFhYBqjl6awwjSKiSgJjF3fTxEq6DEyZlPWEBsZg EJiYMvXkCN4Za4fXoq8wRGvllIymYhKVvAyLSKUb04tagstUjXXC+pKDM9oyQ3MTNH19DAVC8 3tbg4MT01JzGpWC85P3cTIzCQGIBgB+Oxyc6HGCU5mJREeXfO5w4X4kvKT6nMSCzOiC8qzUkt PsQow8GhJMFrfxEoJ1iUmp5akZaZAwxpmLQEB4+SCO+DC0Bp3uKCxNzizHSI1ClGRSlxXmGQP gGQREZpHlwbLI4uMcpKCfMyAh0ixFOQWpSbWYIq/4pRnINRSZhXH2QKT2ZeCdz0V0CLmYAWP/ vHCbK4JBEhJdXAmLpsz9q9c0yvTt01eftf4850mcelvI/KeGrmmrK/3aQhuOEpr0x4y8VvJYu XOD36Ofto6Y2AmSlGj8XmX9JhfhiW9NV+tUZFm/SZh+umPBDL/el89Our5iOsmlUaXYrVRczz PicGa+ocuF67KVuMU/zcRGtb8zctklr2MnOSz8uWxs2vecbzWYmlOCPRUIu5qDgRACUTuqueA gAA X-Env-Sender: prvs=902b7e3ca=Ian.Jackson@citrix.com X-Msg-Ref: server-11.tower-206.messagelabs.com!1460392686!21890714!2 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 17495 invoked from network); 11 Apr 2016 16:38:08 -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:08 -0000 X-IronPort-AV: E=Sophos;i="5.24,462,1454976000"; d="scan'208";a="346243929" From: Ian Jackson To: Date: Mon, 11 Apr 2016 17:37:18 +0100 Message-ID: <1460392641-7060-4-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 3/6] make-distros-flight: Key "snapshot" special case off $branch 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 This eliminates two places where $debian_suite is expected to contain "snapshot" rather than a suite. We want to change debian_suite to always contain a real suite, so that we can fold its uses in to other suite variables. No functional change for existing branches. Signed-off-by: Ian Jackson --- make-distros-flight | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-distros-flight b/make-distros-flight index 9b4684d..060eda3 100755 --- a/make-distros-flight +++ b/make-distros-flight @@ -66,7 +66,7 @@ test_matrix_branch_filter_callback () { test_do_one_netboot () { local diurl= - if [ x$gsuite = xsnapshot ] ; then + if [ $branch = distros-debian-snapshot ] ; then diurl="http://d-i.debian.org/daily-images/$domU/daily/netboot" gsuite=sid gver=daily @@ -174,7 +174,7 @@ test_matrix_do_one () { gsuite=$debian_suite test_do_one_netboot - if [ $debian_suite = "snapshot" ]; then + if [ $branch = distros-debian-snapshot ]; then gsuite=sid for cd in current weekly ; do case ${domU}_${gsuite} in