From patchwork Fri Jan 8 14:29:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 7986881 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 3C6609F38D for ; Fri, 8 Jan 2016 14:33:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 784D8201CE for ; Fri, 8 Jan 2016 14:33:01 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ABAE520149 for ; Fri, 8 Jan 2016 14:33:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHY3U-0004pt-0C; Fri, 08 Jan 2016 14:30:16 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aHY3S-0004oX-C6 for xen-devel@lists.xen.org; Fri, 08 Jan 2016 14:30:14 +0000 Received: from [85.158.143.35] by server-2.bemta-4.messagelabs.com id 14/B6-08977-5F7CF865; Fri, 08 Jan 2016 14:30:13 +0000 X-Env-Sender: prvs=80839a509=Ian.Campbell@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1452263391!9194023!4 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: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19783 invoked from network); 8 Jan 2016 14:30:11 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 8 Jan 2016 14:30:11 -0000 X-IronPort-AV: E=Sophos;i="5.20,538,1444694400"; d="scan'208";a="329856679" From: Ian Campbell To: , Date: Fri, 8 Jan 2016 14:29:55 +0000 Message-ID: <1452263399-14094-8-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1452263368.29416.39.camel@citrix.com> References: <1452263368.29416.39.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell Subject: [Xen-devel] [PATCH RFC OSSTEST v1 08/12] make-flight: Set diversion runvar on d-i based test jobs. X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org 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 Note that make-distros-flight does not want this, since it uses d-i fetched from the web not the version in our config. Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- make-flight | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/make-flight b/make-flight index 50abf97..3b3950a 100755 --- a/make-flight +++ b/make-flight @@ -31,6 +31,8 @@ flight=`./cs-flight-create $blessing $branch` . ./ap-common . ./mfi-common +guestdiversion=`getconfig TftpDiVersion` + case "$branch" in xen-unstable-smoke) global_runvars+=" hostalloc_maxbonus_variation~=0 " @@ -430,6 +432,7 @@ do_pygrub_tests () { test-debian-di xl $xenarch $dom0arch \ debian_arch=amd64 \ debian_suite=$guestsuite \ + debian_diversion=$guestdiversion \ debian_method=netboot \ debian_bootloader=pygrub \ all_hostflags=$most_hostflags @@ -444,6 +447,7 @@ do_pvgrub_tests () { test-debian-di xl $xenarch $dom0arch \ debian_arch=amd64 \ debian_suite=$guestsuite \ + debian_diversion=$guestdiversion \ debian_method=netboot \ debian_bootloader=pvgrub \ all_hostflags=$most_hostflags \ @@ -452,6 +456,7 @@ do_pvgrub_tests () { test-debian-di xl $xenarch $dom0arch \ debian_arch=i386 \ debian_suite=$guestsuite \ + debian_diversion=$guestdiversion \ debian_method=netboot \ debian_bootloader=pvgrub \ all_hostflags=$most_hostflags