From patchwork Mon Apr 28 10:41:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 29200 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 76D4E202FE for ; Mon, 28 Apr 2014 10:42:47 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id m1sf40006831oag.5 for ; Mon, 28 Apr 2014 03:42:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references: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=QevnkFbarHbPJtEfLtmz4+uauws08p6sljEzsyXqhdQ=; b=jb9z4YT+VC0LWrE538drXwyBJ26aaGVyjd6T38kamKJwqaaDUL2B2IF2R3Wh98q6CK wjPq1f4z8D1OdkKm9uCWNzpfLyDcX0ZgsEWaUswwcrC4HjpMYKkjeqgYFigim1O2Sh4O 31pNBniVQ5eaT9YrTG0qTmFnA6Q7gv7mFE9PL8Z4Fboa8EK3NYP96hfrWVHL+M+uDeE5 vYNDpoM4sbaDWsrPh0EaI2F+vjtYuSl0qtJFnciR53dK/VYy/KWjO2vrfjLjRVDWgUr+ y6g3+xOhVhBwhmki4b029A/rtuNw95HbCFKrAYx1/x6aY9hriamEexO+v1T+C87rDC8g nv3w== X-Gm-Message-State: ALoCoQnEp0FKBptZguxdPpWjRo31EwjJRnM9YdQa0xcM0DuxH1j6sko1LbcuzCMdKT9gbEovotjV X-Received: by 10.43.141.196 with SMTP id jf4mr9711235icc.9.1398681766926; Mon, 28 Apr 2014 03:42:46 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.201 with SMTP id k67ls2598106qge.22.gmail; Mon, 28 Apr 2014 03:42:46 -0700 (PDT) X-Received: by 10.221.4.66 with SMTP id ob2mr1138430vcb.28.1398681766755; Mon, 28 Apr 2014 03:42:46 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id cb3si3513308vdc.185.2014.04.28.03.42.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Apr 2014 03:42:46 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id lg15so7824820vcb.16 for ; Mon, 28 Apr 2014 03:42:46 -0700 (PDT) X-Received: by 10.58.185.145 with SMTP id fc17mr23920629vec.14.1398681766676; Mon, 28 Apr 2014 03:42:46 -0700 (PDT) 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.221.72 with SMTP id ib8csp107044vcb; Mon, 28 Apr 2014 03:42:46 -0700 (PDT) X-Received: by 10.50.152.68 with SMTP id uw4mr2063351igb.15.1398681764903; Mon, 28 Apr 2014 03:42:44 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id rt10si12369592igb.26.2014.04.28.03.42.44 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 28 Apr 2014 03:42:44 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) 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 1Wej0X-00083T-8e; Mon, 28 Apr 2014 10:41:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Wej0S-0007xv-OE for xen-devel@lists.xen.org; Mon, 28 Apr 2014 10:41:53 +0000 Received: from [193.109.254.147:46022] by server-11.bemta-14.messagelabs.com id D7/A9-09902-F603E535; Mon, 28 Apr 2014 10:41:51 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-27.messagelabs.com!1398681701!1303545!7 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.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24231 invoked from network); 28 Apr 2014 10:41:50 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-3.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 28 Apr 2014 10:41:50 -0000 X-IronPort-AV: E=Sophos;i="4.97,943,1389744000"; d="scan'208";a="124285778" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 28 Apr 2014 10:41:50 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Mon, 28 Apr 2014 06:41:50 -0400 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=zakaz.uk.xensource.com) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1Wej0O-0007a2-R8; Mon, 28 Apr 2014 11:41:49 +0100 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Mon, 28 Apr 2014 11:41:48 +0100 From: Ian Campbell To: Date: Mon, 28 Apr 2014 11:41:34 +0100 Message-ID: <1398681696-2773-13-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1398681672.29700.55.camel@kazak.uk.xensource.com> References: <1398681672.29700.55.camel@kazak.uk.xensource.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST v2 13/15] Test pygrub and pvgrub on the regular flights 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: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) 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: Since we now have the ability to test these drop one of each of pygrub, pvgrub-32 and pvgrub-64 into the standard flights. Omitting the {Guest}_diver runvar causes ts-debian-di-install to use the d-i images in the location configured via TftpDiVersion, so they are version controlled along with the d-i version used for the host. Signed-off-by: Ian Campbell --- make-flight | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/make-flight b/make-flight index aadf58b..c4ddbc4 100755 --- a/make-flight +++ b/make-flight @@ -233,6 +233,42 @@ do_passthrough_tests () { done } +do_pygrub_tests () { + if [ $xenarch != amd64 -o $dom0arch != amd64 -o "$kern" != "" ]; then + return + fi + + job_create_test test-$xenarch$kern-$dom0arch-pygrub \ + test-debian-di xl $xenarch $dom0arch \ + debian_arch=amd64 \ + debian_dist=$guestsuite \ + debian_method=netboot \ + debian_bootloader=pygrub \ + all_hostflags=$most_hostflags +} + +do_pvgrub_tests () { + if [ $xenarch != amd64 -o $dom0arch != amd64 -o "$kern" != "" ]; then + return + fi + + job_create_test test-$xenarch$kern-$dom0arch-amd64-pvgrub \ + test-debian-di xl $xenarch $dom0arch \ + debian_arch=amd64 \ + debian_dist=$guestsuite \ + debian_method=netboot \ + debian_bootloader=pvgrub \ + all_hostflags=$most_hostflags \ + + job_create_test test-$xenarch$kern-$dom0arch-i386-pvgrub \ + test-debian-di xl $xenarch $dom0arch \ + debian_arch=i386 \ + debian_dist=$guestsuite \ + debian_method=netboot \ + debian_bootloader=pvgrub \ + all_hostflags=$most_hostflags +} + test_matrix_do_one () { # Basic PV Linux test with xl @@ -315,6 +351,9 @@ test_matrix_do_one () { fi do_passthrough_tests + + do_pygrub_tests + do_pvgrub_tests } test_matrix_iterate