From patchwork Fri Nov 21 13:16:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 41316 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6FAD0244B0 for ; Fri, 21 Nov 2014 13:25:27 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id bs8sf3308327wib.10 for ; Fri, 21 Nov 2014 05:25:26 -0800 (PST) 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:content-type :content-transfer-encoding:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive; bh=fVChT2VYYzrXSSP2dxd5syrsFy9wsG6Jk2cGMBjlXz0=; b=mYLLCxhKdQpW0Y45+AS2O/C5ajG+z1GT/n/yPrmol8Fc7xWW8UQ9yn1QhdOTRd47/7 Mndw43K2jza62QYVIjAbkqDv5NBjGQAkIT8Jbqf6iQgB0lUWThodSf52qvZLRPSvM+kG 9Y8e8rVZ6CYdWwXXc4LBBGim/Ax+NfQs9yvvztamUfN7JEfWXjWz0RkiJ/qLIFvQeSZl GDGlnECNE+3flYNunXLGB4w9kJ4XybthkGspcHkfeWceYyTvUOWSxxo9y0D1Qc33HRVU sq41mZPer864hHmHYmjmg2OaNL4mzFhhTsDAPm3wW0CQu3kFeKMbY66E0SjGnls9VBkB O/hw== X-Gm-Message-State: ALoCoQmE01sMcFaWJaeJkUtzdr8Oijq/brdrp0aVpC39DmYrKrCNGYHXIM/Ef464IKOuKUTWdT2C X-Received: by 10.152.42.196 with SMTP id q4mr1546288lal.6.1416575991917; Fri, 21 Nov 2014 05:19:51 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.68 with SMTP id u4ls23736lal.47.gmail; Fri, 21 Nov 2014 05:19:51 -0800 (PST) X-Received: by 10.112.201.6 with SMTP id jw6mr4612766lbc.30.1416575991732; Fri, 21 Nov 2014 05:19:51 -0800 (PST) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id aq3si5315995lbc.78.2014.11.21.05.19.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Nov 2014 05:19:51 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by mail-la0-f53.google.com with SMTP id gm9so1221457lab.40 for ; Fri, 21 Nov 2014 05:19:51 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr4554215lbc.34.1416575991281; Fri, 21 Nov 2014 05:19:51 -0800 (PST) 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.112.184.201 with SMTP id ew9csp87332lbc; Fri, 21 Nov 2014 05:19:50 -0800 (PST) X-Received: by 10.236.209.101 with SMTP id r65mr1585520yho.140.1416575989639; Fri, 21 Nov 2014 05:19:49 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id n94si6704139qgn.55.2014.11.21.05.19.48 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 21 Nov 2014 05:19:49 -0800 (PST) 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 1Xro5J-0007GE-WC; Fri, 21 Nov 2014 13:17:14 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xro5I-0007Ff-3N for xen-devel@lists.xen.org; Fri, 21 Nov 2014 13:17:12 +0000 Received: from [193.109.254.147] by server-13.bemta-14.messagelabs.com id 5D/7C-02699-75B3F645; Fri, 21 Nov 2014 13:17:11 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-13.tower-27.messagelabs.com!1416575827!13996777!3 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28734 invoked from network); 21 Nov 2014 13:17:10 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-13.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 21 Nov 2014 13:17:10 -0000 X-IronPort-AV: E=Sophos;i="5.07,431,1413244800"; d="scan'208";a="193695882" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Fri, 21 Nov 2014 08:17:09 -0500 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 1Xro5D-0003AZ-Tv; Fri, 21 Nov 2014 13:17:08 +0000 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Fri, 21 Nov 2014 13:17:07 +0000 From: Ian Campbell To: Date: Fri, 21 Nov 2014 13:16:53 +0000 Message-ID: <1416575824-15555-4-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1416505070.26869.2.camel@citrix.com> References: <1416505070.26869.2.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST v3 04/15] make-flight: Run a basic test on each arm platform 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) 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: Unlike x86 there is enough variation in the ARM platforms that it is worth having a basic test on each as part of a standard run. This relies on each host having an appropriate platform-$platform host flag. The existing test-ARCH-ARCH-xl test is retained as a floating test, while a new variant is added for each distinct platform present in the hostdb which is tied to that platform type. The intention is that only arm platforms will have platforms at first, although perhaps platform-intel and platform-amd could be added in the future too. There are currently no platform-* flags in the hostdb, so tested with s/platform-/equiv-/ and: ( set -ex ; source ./cri-getplatforms ; blessing=real ; export OSSTEST_CONFIG=production-config ; for p in '' `getplatforms "armhf"` ; do set +x ; echo PLATFORM: $p ; done ) which prints: PLATFORM: PLATFORM: marilith and with s/armhf/amd64/: PLATFORM: PLATFORM: rackservers-s40670 PLATFORM: r310-moth PLATFORM: rackservers-s40680 PLATFORM: dell-r310 PLATFORM: rackservers-s40679 PLATFORM: rackservers-s40663 PLATFORM: rackservers-q21011 Also tested in standalone mode with a ~/.xen-osstest/config containing: PlatformsArmhf midway cubietruck arndale Signed-off-by: Ian Campbell v3: Split /\s+/ Acked-by: Ian Jackson --- v2: Use platform-* prop not equiv-* Select platforms from host db --- Osstest/HostDB/Executive.pm | 28 ++++++++++++++++++++++++++++ Osstest/HostDB/Static.pm | 9 +++++++++ README | 3 +++ cri-getplatforms | 25 +++++++++++++++++++++++++ make-flight | 9 +++++++-- 5 files changed, 72 insertions(+), 2 deletions(-) create mode 100755 cri-getplatforms diff --git a/Osstest/HostDB/Executive.pm b/Osstest/HostDB/Executive.pm index b2c8dc9..6257829 100644 --- a/Osstest/HostDB/Executive.pm +++ b/Osstest/HostDB/Executive.pm @@ -67,6 +67,34 @@ END return $flags; } +sub get_arch_platforms ($$) { + my ($hd, $blessing, $arch) = @_; + + my @plats = ( ); + my $platsq = $dbh_tests->prepare(<execute("blessed-$blessing", "arch-$arch"); + + while (my ($plat) = $platsq->fetchrow_array()) { + $plat =~ s/^platform-//g or die; + push @plats, $plat; + } + + $platsq->finish(); + return @plats; +} + sub default_methods ($$) { my ($hd, $ho) = @_; diff --git a/Osstest/HostDB/Static.pm b/Osstest/HostDB/Static.pm index ad18395..60f5d3c 100644 --- a/Osstest/HostDB/Static.pm +++ b/Osstest/HostDB/Static.pm @@ -65,6 +65,15 @@ sub get_flags ($$) { #method return $flags; } +sub get_arch_platforms ($$) { + my ($hd, $blessing, $arch) = @_; + + my $prop = "Platforms".ucfirst($arch); + + return split /\s+/, $c{$prop} if $c{$prop}; + return () unless $c{$prop}; +} + sub default_methods ($$) { #method my ($hd, $ho) = @_; diff --git a/README b/README index 3fe5ecc..35532b7 100644 --- a/README +++ b/README @@ -395,6 +395,9 @@ The keys in ~/.ssh/id_{rsa,dsa}.pub and ~/.ssh/authorized_keys TestHostKeypairPath +Platforms + List of platforms (i.e. distinct host types) to run a basic test on. + HostProp_GenEtherPrefixBase 5e:36:0e:f5 # :00:01 guest number in job appended # in standalone jobdb, ^^^^^ xor'd with low 16 bits of your uid diff --git a/cri-getplatforms b/cri-getplatforms new file mode 100755 index 0000000..067730c --- /dev/null +++ b/cri-getplatforms @@ -0,0 +1,25 @@ +# -*- bash -*- + +# This is part of "osstest", an automated testing framework for Xen. +# Copyright (C) 2014 Citrix Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +getplatforms () { + perl -e ' + use Osstest; + csreadconfig(); + print join " ", $mhostdb->get_arch_platforms("'$blessing'", "'$1'") or die $!; + ' +} diff --git a/make-flight b/make-flight index 9963a46..0814eba 100755 --- a/make-flight +++ b/make-flight @@ -27,6 +27,7 @@ buildflight=$4 flight=`./cs-flight-create $blessing $branch` . cri-common +. cri-getplatforms . ap-common . mfi-common @@ -284,10 +285,14 @@ do_passthrough_tests () { test_matrix_do_one () { # Basic PV Linux test with xl + for platform in '' `getplatforms $xenarch` ; do + suffix=${platform:+-$platform} + hostflags=${most_hostflags}${platform:+,platform-$platform} - job_create_test test-$xenarch$kern-$dom0arch-xl test-debian xl \ + job_create_test test-$xenarch$kern-$dom0arch-xl$suffix test-debian xl \ $xenarch $dom0arch \ - $debian_runvars all_hostflags=$most_hostflags + $debian_runvars all_hostflags=$hostflags + done job_create_test test-$xenarch$kern-$dom0arch-libvirt test-debian libvirt \ $xenarch $dom0arch \