From patchwork Wed Oct 29 10:41:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 39747 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7079524029 for ; Wed, 29 Oct 2014 10:42:47 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id ge10sf1524085lab.1 for ; Wed, 29 Oct 2014 03:42:46 -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=By+QYt/29EH1U5qjX+kbSg65KoGCCvBea4V/+SMEjvI=; b=lztbgyzqkkW+JcPtuwuqLJqO/DVjKtf/FtAT3NI85novwoFVE/XGUGNitSl+XiiLLh bsfxa7q5zcSRt+ZPnWT7ERYlM4W8/v8bk5O+V4KEE5tEaQBqNRKQlvDCFr0OVR9K88EL mMtzfNdCMdux/sbjtcT00XU7bLIK6NG0yAlyL4lVW5zHZdMOZGVjOVJVU8w+jU4fbnX8 y4lS4ItdHc/C3iVqPlYepocJOPQVArLm6lhS0Jnw47eVQwQRUbVAIsAJq63TMEbhlsHh QCPgqDAxEAs2qIXNYmrezP68+2cq6LxO+GsUAkGp/+y1zrtFLBzfn/NtLwn+xp63zBce oxng== X-Gm-Message-State: ALoCoQkijHKKIqvV8iNI5uXz9dX39RkJ6azVR61BPZirovwF9WK2MgkJIHulu3/79fcA0iSKYVl9 X-Received: by 10.194.86.66 with SMTP id n2mr17017wjz.7.1414579366273; Wed, 29 Oct 2014 03:42:46 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.67 with SMTP id o3ls182365laj.22.gmail; Wed, 29 Oct 2014 03:42:46 -0700 (PDT) X-Received: by 10.152.8.136 with SMTP id r8mr10405236laa.91.1414579366081; Wed, 29 Oct 2014 03:42:46 -0700 (PDT) Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com. [209.85.217.179]) by mx.google.com with ESMTPS id jr4si6662988lab.19.2014.10.29.03.42.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 29 Oct 2014 03:42:45 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.179 as permitted sender) client-ip=209.85.217.179; Received: by mail-lb0-f179.google.com with SMTP id w7so2208481lbi.38 for ; Wed, 29 Oct 2014 03:42:45 -0700 (PDT) X-Received: by 10.152.116.102 with SMTP id jv6mr10490780lab.40.1414579365735; Wed, 29 Oct 2014 03:42:45 -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.112.84.229 with SMTP id c5csp633457lbz; Wed, 29 Oct 2014 03:42:44 -0700 (PDT) X-Received: by 10.140.83.7 with SMTP id i7mr13821703qgd.14.1414579361825; Wed, 29 Oct 2014 03:42:41 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id y78si6737423qgy.79.2014.10.29.03.42.41 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 29 Oct 2014 03:42:41 -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 1XjQhR-0002OD-LN; Wed, 29 Oct 2014 10:41:57 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XjQhQ-0002MJ-4v for xen-devel@lists.xen.org; Wed, 29 Oct 2014 10:41:56 +0000 Received: from [85.158.143.35] by server-1.bemta-4.messagelabs.com id 16/D4-02952-374C0545; Wed, 29 Oct 2014 10:41:55 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-9.tower-21.messagelabs.com!1414579313!13416260!1 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.12.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 28793 invoked from network); 29 Oct 2014 10:41:54 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-9.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 29 Oct 2014 10:41:54 -0000 X-IronPort-AV: E=Sophos;i="5.04,809,1406592000"; d="scan'208";a="187318373" 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; Wed, 29 Oct 2014 06:41:52 -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 1XjQhL-00014e-HD; Wed, 29 Oct 2014 10:41:52 +0000 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Wed, 29 Oct 2014 10:41:51 +0000 From: Ian Campbell To: Date: Wed, 29 Oct 2014 10:41:31 +0000 Message-ID: <1414579302-6692-9-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <1414579268.29975.13.camel@citrix.com> References: <1414579268.29975.13.camel@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST v2 09/20] 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.217.179 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 --- 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 d0c13a1..e786761 100644 --- a/Osstest/HostDB/Static.pm +++ b/Osstest/HostDB/Static.pm @@ -63,6 +63,15 @@ sub get_flags ($$) { #method return $flags; } +sub get_arch_platforms ($$) { + my ($hd, $blessing, $arch) = @_; + + my $prop = "Platforms".ucfirst($arch); + + return split /[, ]/, $c{$prop} if $c{$prop}; + return () unless $c{$prop}; +} + sub default_methods ($$) { #method my ($hd, $ho) = @_; diff --git a/README b/README index 9a85549..5c5f347 100644 --- a/README +++ b/README @@ -381,6 +381,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 \