From patchwork Fri Jan 22 15:56:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 12039851 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C2F3C433E9 for ; Fri, 22 Jan 2021 15:56:27 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 50BB8221FF for ; Fri, 22 Jan 2021 15:56:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 50BB8221FF Authentication-Results: mail.kernel.org; dmarc=pass (p=none dis=none) header.from=xenproject.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.72903.131446 (Exim 4.92) (envelope-from ) id 1l2ynJ-0004hA-1G; Fri, 22 Jan 2021 15:56:17 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 72903.131446; Fri, 22 Jan 2021 15:56:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynI-0004gS-DU; Fri, 22 Jan 2021 15:56:16 +0000 Received: by outflank-mailman (input) for mailman id 72903; Fri, 22 Jan 2021 15:56:14 +0000 Received: from mail.xenproject.org ([104.130.215.37]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynG-0004br-2j for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:14 +0000 Received: from xenbits.xenproject.org ([104.239.192.120]) by mail.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1l2ynG-0002Ob-1s for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:14 +0000 Received: from iwj (helo=mariner.uk.xensource.com) by xenbits.xenproject.org with local-bsmtp (Exim 4.92) (envelope-from ) id 1l2ynG-0000SN-0s for xen-devel@lists.xenproject.org; Fri, 22 Jan 2021 15:56:14 +0000 Received: from [172.18.45.5] (helo=zealot.relativity.greenend.org.uk) by mariner.uk.xensource.com with esmtp (Exim 4.89) (envelope-from ) id 1l2ynE-0004Ar-A8; Fri, 22 Jan 2021 15:56:12 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=xenproject.org; s=20200302mail; h=Content-Transfer-Encoding:Content-Type: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=Osxwv6TTrw4qA6JUSNzB0731pq0mWQGw3JpKLz3zbug=; b=DcTO6ijwTkiRFjISONoV7QY3MZ xVwFLntgb+X7NXlokxqGtM3h1aBy0cH1UjhxDEsMWIkI/b/Pk4FjTpmSzNZtuJmXJIrnLWmj6VOv7 tM116srHK6Su/Hla5r2vH6Aj/u4M6TXb/pPRgR/wM77fn2AoT0zlk3H9W3Qw5AiiwZwo=; From: Ian Jackson To: xen-devel@lists.xenproject.org Cc: Ian Jackson , =?utf-8?b?RWR3aW4gVMO2csO2aw==?= , Christian Lindig , Andrew Cooper , =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= , Wei Liu , Ian Jackson Subject: [OSSTEST PATCH 7/7] make-flight: Stripy xenstored Date: Fri, 22 Jan 2021 15:56:03 +0000 Message-Id: <20210122155603.23402-7-iwj@xenproject.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210122155603.23402-1-iwj@xenproject.org> References: <20210122155603.23402-1-iwj@xenproject.org> MIME-Version: 1.0 Previously, we let the Xen build system and startup scripts choose which xenstored to use. Before we upgraded to Debian buster, that gave us C xentored tests on ARM. Since then, armhf and arm64 have both had enough ocaml support and we haven't been testing C xenstored at all ! Change this, by selecting between C xenstored and Ocaml xenstored "at random". Actually, this is based on the job name. So the same job in different branches will use the same xenstored - which helps avoid confusion. I have diffed the output of standalone-generate-dump-flight-runvars. As expected, this addes a variable all_host_xenstored to every job. To make sure we have enough diversity, I eyeballed the results. In particular: * The smoke tests now have 2 C and 2 Ocaml, one of each on ARM and x86. * XTF tests have 2 oxenstored and 3 C xenstored. * The ovmf flight has one of each * The seabios and libvirt flights look reasonably mixed. Most other flights have enough jobs that I think things are diverse enough without looking at them all in detail. I think this lack of testing needs fixing for the Xen 4.15 release. So after review I intend to push this to osstest pretest, and may force push it even if shows regressions. CC: Edwin Török CC: Christian Lindig CC: Andrew Cooper CC: Jürgen Groß CC: Wei Liu Signed-off-by: Ian Jackson Release-Acked-by: Ian Jackson Acked-by: Christian Lindig --- mfi-common | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/mfi-common b/mfi-common index 35efd233..2834411f 100644 --- a/mfi-common +++ b/mfi-common @@ -509,6 +509,13 @@ job_create_test () { xenbuildjob="${bfi}build-$xenarch$xsm_suffix" buildjob="${bfi}build-$dom0arch$xsm_suffix" + local xenstored="$xenstored" + if [ "$xenstored" = "" ]; then + stripy_rand "$job 2" xenstored xenstored oxenstored + # Without " ", all XTF jobs use oxenstored + # With " 1", All OVMF tests use xenstored + fi + job_create_test_filter_callback \ "$job" "$recipe" "$toolstack" "$xenarch" "$dom0arch" "$@" || return 0 @@ -529,7 +536,8 @@ job_create_test () { ./cs-job-create $flight $job $recipe toolstack=$toolstack \ $RUNVARS $TEST_RUNVARS $global_runvars $most_runvars \ - xenbuildjob=$xenbuildjob buildjob=$buildjob $tsbuildjob "$@" + xenbuildjob=$xenbuildjob buildjob=$buildjob \ + all_host_xenstored=$xenstored $tsbuildjob "$@" } usual_debianhvm_image () {