From patchwork Fri Mar 15 15:48:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13593668 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id F270CC54E58 for ; Fri, 15 Mar 2024 15:49:13 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.693915.1082589 (Exim 4.92) (envelope-from ) id 1rl9nm-0006qC-64; Fri, 15 Mar 2024 15:48:58 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 693915.1082589; Fri, 15 Mar 2024 15:48:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rl9nm-0006pn-1z; Fri, 15 Mar 2024 15:48:58 +0000 Received: by outflank-mailman (input) for mailman id 693915; Fri, 15 Mar 2024 15:48:57 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rl9nl-0006nS-7r for xen-devel@lists.xenproject.org; Fri, 15 Mar 2024 15:48:57 +0000 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [2a00:1450:4864:20::42e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 86abc7b0-e2e3-11ee-a1ee-f123f15fe8a2; Fri, 15 Mar 2024 16:48:54 +0100 (CET) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-33e8b957a89so1454670f8f.0 for ; Fri, 15 Mar 2024 08:48:54 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id bw29-20020a0560001f9d00b0033ecaf7a2adsm3394689wrb.23.2024.03.15.08.48.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 08:48:52 -0700 (PDT) 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" X-Inumbo-ID: 86abc7b0-e2e3-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710517733; x=1711122533; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=M6yTHZbvAYgPYQxhgozyTT9aLniHTdMU1NEg2rJApoQ=; b=mMTQU2bDAIFzLXorilqonjlKpzUlRTEYg9Sxh5K5puRFN8UhDRjl+1MUaOFZgIIXkn fk+6dpbSiHfrzkOvpeQQoUVpTLxQ0PKD4WDIcIIVl/YfQn2oVfZjBccUcgMUJlNXiw/v IvkcXetx+g5a1glzdXnJOm9H1KAxKZN+apHrg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710517733; x=1711122533; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=M6yTHZbvAYgPYQxhgozyTT9aLniHTdMU1NEg2rJApoQ=; b=G4YoGdfqgCuv8bOZkh6pPwEeCUs+lxUiaibJdExvmsT6bSb8ciDVNNXrITjFkqbfJh vhUGcOVqm2uMfxDYruMJIxwvpVOHRUlSQR85a6InfZcEq8o+hpuj/F0M5i4poqvdQuUy oZdpM7CR2WjTFf0kg++NFc5qOIn7B80EHmMdjQ7YVsbzh15GLrGvbViAqRfTkD96qFIn FNuc0g4dsQsPfszysMJBG3RUBGpJTEiPixxMxy8cAUepMnMJy8fn7vK5acOJNfkGBrfa fiVi/PsnwLxbDuHuhaeb9WuD7ReGw5gECFSTPXxCtXqJbbWfHrbPkahLItJl/bhsp4oT kkMQ== X-Gm-Message-State: AOJu0YzL3F1vXkkGVxSx49S4v1vZz2h0kothoPXvxujiEhO1j0iDbTSW H76A1L0qUtpAkJ4Zqn8G/UCGRca3OpGr77bqGHnsgZW1ycR7eF6yx/QMTizRq5VsbVgI3Kw34EG p X-Google-Smtp-Source: AGHT+IFTqUWpcn+teuUysKa+tyI2jjGO+7Xocq8aLMXMlR/EmcMAAgN2Cx1B/ge2Su8QE0+I3CG4nA== X-Received: by 2002:a5d:64a6:0:b0:33e:c601:fcfd with SMTP id m6-20020a5d64a6000000b0033ec601fcfdmr3615824wrp.43.1710517733466; Fri, 15 Mar 2024 08:48:53 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH v2 1/3] make-fligh: Fix freebsd guest test test-id Date: Fri, 15 Mar 2024 15:48:47 +0000 Message-Id: <20240315154849.28819-2-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240315154849.28819-1-anthony.perard@citrix.com> References: <20240315154849.28819-1-anthony.perard@citrix.com> MIME-Version: 1.0 Current freebsd as guest tests rely on the variable $qemuu_suffix, but that one may or may not be set yet, and can't be rely upon. It isn't set on the first iteration which call test_matrix_do_one(), with xenarch=amd64 dom0arch=i386, but it is on the second call with xenarch=amd64 dom0arch=amd64. Only flights on branch linux-linus and linux-6.1 are changes (and the disabled linux-next branch). This is because the first call of test_matrix_do_one() is with dom0arch=amd64 as we skip "i386". On those branches, we have this changes in jobs names: -test-amd64-amd64-freebsd11-amd64 -test-amd64-amd64-freebsd12-amd64 +test-amd64-amd64-qemuu-freebsd11-amd64 +test-amd64-amd64-qemuu-freebsd12-amd64 This patch will have the benefit to avoid the opposite changes in all the other branches as we are going to make some changes to job generation. Signed-off-by: Anthony PERARD --- make-flight | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-flight b/make-flight index d7eeb4eb..155a0c1f 100755 --- a/make-flight +++ b/make-flight @@ -248,11 +248,11 @@ do_freebsd_tests () { # NB: limit to amd64 ATM due to bugs with the i386 versions (11.3 and 12.1). for freebsdarch in amd64; do - job_create_test test-$xenarch$kern-$dom0arch$qemuu_suffix-freebsd11-$freebsdarch \ + job_create_test test-$xenarch$kern-$dom0arch-qemuu-freebsd11-$freebsdarch \ test-freebsd xl $xenarch $dom0arch freebsd_arch=$freebsdarch \ freebsd_image=${FREEBSD_IMAGE_PREFIX-FreeBSD-11.3-RELEASE-}$freebsdarch${FREEBSD_IMAGE_SUFFIX-.raw.xz} \ all_hostflags=$most_hostflags,hvm - job_create_test test-$xenarch$kern-$dom0arch$qemuu_suffix-freebsd12-$freebsdarch \ + job_create_test test-$xenarch$kern-$dom0arch-qemuu-freebsd12-$freebsdarch \ test-freebsd xl $xenarch $dom0arch freebsd_arch=$freebsdarch \ freebsd_image=${FREEBSD_IMAGE_PREFIX-FreeBSD-12.1-RELEASE-}$freebsdarch${FREEBSD_IMAGE_SUFFIX-.raw.xz} \ all_hostflags=$most_hostflags,hvm From patchwork Fri Mar 15 15:48:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13593667 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id E8535C54E68 for ; Fri, 15 Mar 2024 15:49:15 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.693916.1082603 (Exim 4.92) (envelope-from ) id 1rl9nn-0007GF-AQ; Fri, 15 Mar 2024 15:48:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 693916.1082603; Fri, 15 Mar 2024 15:48:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rl9nn-0007G8-7k; Fri, 15 Mar 2024 15:48:59 +0000 Received: by outflank-mailman (input) for mailman id 693916; Fri, 15 Mar 2024 15:48:57 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rl9nl-0006nS-Mo for xen-devel@lists.xenproject.org; Fri, 15 Mar 2024 15:48:57 +0000 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [2a00:1450:4864:20::429]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 87ceb89e-e2e3-11ee-a1ee-f123f15fe8a2; Fri, 15 Mar 2024 16:48:56 +0100 (CET) Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-33e9ba0eadcso1737201f8f.2 for ; Fri, 15 Mar 2024 08:48:56 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id bw29-20020a0560001f9d00b0033ecaf7a2adsm3394689wrb.23.2024.03.15.08.48.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 08:48:53 -0700 (PDT) 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" X-Inumbo-ID: 87ceb89e-e2e3-11ee-a1ee-f123f15fe8a2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710517735; x=1711122535; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Cff+tBKrHygNjFy5WuxJ/QQ3GCTm7QZWRNHRxDD+f0Y=; b=qu1d5hb+4s8N3YWQ5eJoYhoguaQaj08LUSi1GH149/ZC++jYG6eIfvdJfhtL/5Kst8 1DHW1qlwWodEBJTkr2BPvFwuAk+1vkrm6jNXdNJFvOBj0lOqvF/SC80e7+QGAGqTqMKr HVp6SGHcLD4rD3kWyw9LF5PggDeBvqlo4m9GI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710517735; x=1711122535; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Cff+tBKrHygNjFy5WuxJ/QQ3GCTm7QZWRNHRxDD+f0Y=; b=qTIxg2dTj9n/nixrtAKRh+LKofEsE/KxlTU1Dsxxy2o4+N0EiTdmZlxT/Db4oSaM1t 0qUBWaZVGWeqxjwsDaaRZwKRMLNeaCnTEHaghwfjhofVTYfPXFJn2nMIQ6gjn4vPdMig cvYOLbmXx/UW6s8UnuddThF81CWv6WAemSWIe7zKD6xNq5HQrhnBHbP7XMtMRIfiakCh ekoKoXdz7R1YOZg29rGlHySH4Jdr2jZE+3b13lkl8Z7LQdA44FdgR9oVrlhj16goBwiD lGLIQ8elsz+iyWQl9No8RVoDdANMxLnhnmKSrrhYT4HiKYb8HD/qWTpGI3TkZE8vrUaK Tulw== X-Gm-Message-State: AOJu0YwvHzh2njAtn8rpIYTkyDClDkbRU+FmATOirxckMfa16FjVKrYf tVpDzLkJOEmViSyUQi+ZtiP15qDb/o7+WT0oW8LoS0ZlCUzXMIzWqMZcWKR+PTKfP90IdfZ3vNT K X-Google-Smtp-Source: AGHT+IE+Q3XFie4743wbkm+Cs8yfcDEkexgkNESoNnzxOrsUwhfQSsm5hBauDDfM7Dkh3oVC0kKRhA== X-Received: by 2002:a5d:428c:0:b0:33e:774f:e3ca with SMTP id k12-20020a5d428c000000b0033e774fe3camr4246024wrq.64.1710517735190; Fri, 15 Mar 2024 08:48:55 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne Subject: [OSSTEST PATCH v2 2/3] mfi-common: Rework toolstack-disk_format test matrix Date: Fri, 15 Mar 2024 15:48:48 +0000 Message-Id: <20240315154849.28819-3-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240315154849.28819-1-anthony.perard@citrix.com> References: <20240315154849.28819-1-anthony.perard@citrix.com> MIME-Version: 1.0 There is 6 potenteil test of toolstack disk_format combination: {xl,libvirt}-{raw,vhd,qcow2}. Commit f536e834f673 ("make-flight: Trim the matrix of disk format flights") introduced a way to avoid testing on every architecture and actually do only 6 tests accross all arches, 3 on x86, 3 on armhf (no arm64 at the time). But, commit 5c70735f177f ("fmtarches: Use dom0arches, not hardcoded arch list") broke that. There's an extra space ' ' added at the begining of the string in variable $fmtarches_outer which break the algorithm. This mean that the combination of xl+raw is never tested and both armhf and amd64 are testing the same combination of toolstack+disk_format. We could just remove the extra ' ', but that would mean 3 extra tests on armhf and 3 extra tests on arm64. At least x86 would have a test for each combination. I'd like to avoid adding more arm* tests due to limited capacity, so the new goal is to have the 6 combination of toolstack-disk_format spread on both arm*, where each get to test all possible disk_format. On x86, we are also going to tests all 6 combinations, which might all happen on dom0=amd64 if we don't test dom0=i386, or they will be spread on both kind of dom0. To avoid too many changes in jobs on x86 with the current list of jobs, we reverse the order of "i386" and "amd64". Jobs changes on xen-unstable and most branches: x86: + test-amd64-amd64-xl-raw + test-amd64-i386-libvirt-qcow2 arm*: - test-armhf-armhf-libvirt-qcow2 - test-armhf-armhf-libvirt-raw - test-armhf-armhf-xl-vhd + test-armhf-armhf-libvirt-vhd + test-armhf-armhf-xl-qcow2 + test-armhf-armhf-xl-raw Jobs changes on linux-{linus,next,6.1}: x86: + test-amd64-amd64-libvirt-vhd + test-amd64-amd64-xl-qcow2 + test-amd64-amd64-xl-raw arm*: - test-armhf-armhf-libvirt-qcow2 - test-armhf-armhf-libvirt-raw - test-armhf-armhf-xl-vhd + test-armhf-armhf-libvirt-vhd + test-armhf-armhf-xl-qcow2 + test-armhf-armhf-xl-raw Signed-off-by: Anthony PERARD --- Notes: Putting i386 in second or later in dom0arches mean that the freebsd10 jobs on i386 are been renamed to have -qemuu... but those will disappear with a follow-up change to use linux 6.1, as will stop i386 dom0 tests. mfi-common | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mfi-common b/mfi-common index d8d167fd..00669677 100644 --- a/mfi-common +++ b/mfi-common @@ -649,7 +649,7 @@ test_matrix_iterate () { esac dom0arches='' - for dom0arch in i386 armhf amd64 arm64; do + for dom0arch in amd64 i386 armhf arm64; do case ${xenarch}_${dom0arch} in amd64_amd64) ;; @@ -667,9 +667,15 @@ test_matrix_iterate () { dom0arches+=" $dom0arch" done + dom0arches=${dom0arches# } for dom0arch in $dom0arches; do + # For disk format tests, in do_pv_debian_tests() + case $xenarch in + arm*) dom0arches="armhf arm64" ;; + esac + eval " arch_runvars=\"\$ARCH_RUNVARS_$dom0arch\" " From patchwork Fri Mar 15 15:48:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 13593670 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 9C4B0C54E67 for ; Fri, 15 Mar 2024 15:49:16 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.693917.1082611 (Exim 4.92) (envelope-from ) id 1rl9nn-0007J9-L8; Fri, 15 Mar 2024 15:48:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 693917.1082611; Fri, 15 Mar 2024 15:48:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rl9nn-0007IH-Dv; Fri, 15 Mar 2024 15:48:59 +0000 Received: by outflank-mailman (input) for mailman id 693917; Fri, 15 Mar 2024 15:48:58 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1rl9nm-0006uT-J0 for xen-devel@lists.xenproject.org; Fri, 15 Mar 2024 15:48:58 +0000 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [2a00:1450:4864:20::42e]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 889fef52-e2e3-11ee-afdd-a90da7624cb6; Fri, 15 Mar 2024 16:48:57 +0100 (CET) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-33ed4d8e9edso418018f8f.2 for ; Fri, 15 Mar 2024 08:48:57 -0700 (PDT) Received: from localhost.localdomain (cpc92320-cmbg19-2-0-cust35.5-4.cable.virginm.net. [82.13.64.36]) by smtp.gmail.com with ESMTPSA id bw29-20020a0560001f9d00b0033ecaf7a2adsm3394689wrb.23.2024.03.15.08.48.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Mar 2024 08:48:55 -0700 (PDT) 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" X-Inumbo-ID: 889fef52-e2e3-11ee-afdd-a90da7624cb6 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1710517737; x=1711122537; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aSG7P4fI+ffI86jlOgtGbDAtFP5aasyP8dl1KHYjsJ4=; b=S6BeMBhXrqyNVsIsjw1vyLs3HKmbiN2YzcI+Mjx/5Xm3xaWvUxmvhNVmp651x8SpdH NPthCu92ndkyGFMXGIi1jsLsUnG34OnjVf25q2owB7KAX8XL2wC2G4Xpa3cHjt0nqEKw 29+ud0wa3mNA3GFfkFcLNdOgjfxMSyeZGcank= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710517737; x=1711122537; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aSG7P4fI+ffI86jlOgtGbDAtFP5aasyP8dl1KHYjsJ4=; b=nqpHdfwpPv9CNsN0VgQZBxM7pGlg/oSXxKzKAUbsZGGcbLyPpcP0RZ862G9wtx5NA8 bZufOVjEbXOiNFdqKz1O2g2S6qQjQ+MYCLkYLXIIi+g3Uyd85OgjtbaD+WSgPoVyqEKp 7zgJ4QGVexMCIqaTyLhN4n2QZPQWm/Betdj+pzCdSGA045ZVFj9GYZxIBiF+Jxg13GT/ M1QFfg2CNOKERcR70jbPzO3wT2ij2w8Y/VPI+mpgPV8Zd4H/+PpIRrUVe1k2EMZJNU47 +TZS0R71QyUwNRxdWyl8/nYfNMmYtK6Hit/TqmpSAy72pBmr2Pdb7ADPxScAfMKzJWF6 a3OQ== X-Gm-Message-State: AOJu0YzqOjKcMt7/i378Jm5/YVSWy3uF41DOSH7u8XlsIaSxkPQPBCq+ tG/HSFqxpIbWZBSImHfqsaE6//agBiMLlqvNdwKW/JpaNyrUy5W9Vcz1gz0k5/0QGCU6xU8Z3gF C X-Google-Smtp-Source: AGHT+IFQzLoBakuE4e4ZmqxbkuXP4H1B4R13QRj/UFxClVBf7R4LSuwX6fNc/0nYNv6w86hkU9C9BQ== X-Received: by 2002:adf:ee0f:0:b0:33e:7946:4cc8 with SMTP id y15-20020adfee0f000000b0033e79464cc8mr3851476wrn.19.1710517736806; Fri, 15 Mar 2024 08:48:56 -0700 (PDT) From: Anthony PERARD To: xen-devel@lists.xenproject.org Cc: Roger Pau Monne , Jan Beulich , Andrew Cooper , Juergen Gross Subject: [OSSTEST PATCH v2 3/3] ap-common: Switch to Linux 6.1 by default on x86 + drop dom0 i386 Date: Fri, 15 Mar 2024 15:48:49 +0000 Message-Id: <20240315154849.28819-4-anthony.perard@citrix.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240315154849.28819-1-anthony.perard@citrix.com> References: <20240315154849.28819-1-anthony.perard@citrix.com> MIME-Version: 1.0 linux-4.19 branch in xenbits is outdated, it haven't been updated and tested since 2020 as it has been disabled in osstest. Also, this 4.19 branch doesn't build on Bookworm. So we will start to use a newer version of Linux. We switch to 6.1 for the Arm* tests recently, so will use that same version for x86. Also, following commit 3a3089c94913 ("mfi-common: Drop Linux dom0 i386 tests for newer Linux branches"), 32bit dom0 isn't tested on newer Linux, so we need to drop all dom0 i386 tests wherever the default linux branch is used. That is, this changes in jobs will apply to "xen-unstable" branch but also all xen stable branches, seabios, qemu, osstest, libvirt, so every branch that aren't "linux-*". Here is the list jobs that changes, and whether they are replace, or have existing equivalents, on the "xen-unstable" branch. Changes compared with: OSSTEST_CONFIG=standalone-config-example nice eatmydata ./standalone-generate-dump-flight-runvars Gone, without exiting or new test-amd64-amd64-*: - test-amd64-i386-freebsd10-amd64 - test-amd64-i386-freebsd10-i386 - test-amd64-i386-qemut-rhel6hvm-amd - test-amd64-i386-qemut-rhel6hvm-intel - test-amd64-i386-qemuu-rhel6hvm-amd - test-amd64-i386-qemuu-rhel6hvm-intel Gone, but with exiting test-amd64-amd64-* equivalent: - test-amd64-coresched-i386-xl - test-amd64-i386-examine - test-amd64-i386-examine-bios - test-amd64-i386-examine-uefi - test-amd64-i386-libvirt - test-amd64-i386-libvirt-pair - test-amd64-i386-libvirt-qemuu-debianhvm-amd64-xsm - test-amd64-i386-libvirt-xsm - test-amd64-i386-livepatch - test-amd64-i386-migrupgrade - test-amd64-i386-pair - test-amd64-i386-xl - test-amd64-i386-xl-pvshim - test-amd64-i386-xl-qemut-debianhvm-amd64 - test-amd64-i386-xl-qemut-debianhvm-i386-xsm - test-amd64-i386-xl-qemut-stubdom-debianhvm-amd64-xsm - test-amd64-i386-xl-qemut-win7-amd64 - test-amd64-i386-xl-qemut-ws16-amd64 - test-amd64-i386-xl-qemuu-debianhvm-amd64 - test-amd64-i386-xl-qemuu-debianhvm-amd64-shadow - test-amd64-i386-xl-qemuu-debianhvm-i386-xsm - test-amd64-i386-xl-qemuu-dmrestrict-amd64-dmrestrict - test-amd64-i386-xl-qemuu-ovmf-amd64 - test-amd64-i386-xl-qemuu-win7-amd64 - test-amd64-i386-xl-qemuu-ws16-amd64 - test-amd64-i386-xl-shadow - test-amd64-i386-xl-simplat-amd64-buster - test-amd64-i386-xl-xsm Gone, but replaced by a new test-amd64-amd64-*: - test-amd64-i386-libvirt-qcow2 - test-amd64-i386-libvirt-raw - test-amd64-i386-xl-vhd + test-amd64-amd64-libvirt-qcow2 + test-amd64-amd64-libvirt-raw + test-amd64-amd64-xl-vhd In any case, the list of test would be the same as for the existing branch "linux-linus" or "linux-6.1" branches. Signed-off-by: Anthony PERARD Acked-by: Juergen Gross --- Notes: CC: Jan Beulich CC: Andrew Cooper CC: Juergen Gross ap-common | 2 +- mfi-common | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ap-common b/ap-common index 48a95a22..5384891b 100644 --- a/ap-common +++ b/ap-common @@ -59,7 +59,7 @@ : ${PUSH_TREE_LINUX:=$XENBITS:/home/xen/git/linux-pvops.git} : ${BASE_TREE_LINUX:=git://xenbits.xen.org/linux-pvops.git} -: ${BASE_TAG_LINUX:=tested/linux-4.19} +: ${BASE_TAG_LINUX:=tested/linux-6.1} : ${BASE_TAG_LINUX_ARM:=tested/linux-6.1} if [ "x${TREE_LINUX}" = x ]; then diff --git a/mfi-common b/mfi-common index 00669677..6dc39422 100644 --- a/mfi-common +++ b/mfi-common @@ -662,7 +662,7 @@ test_matrix_iterate () { case "${branch}_${dom0arch}" in linux-5.4_i386 | linux-[2-4].*_i386) ;; # keep 32-bit for old linux - linux-*_i386) continue;; + *_i386) continue;; esac dom0arches+=" $dom0arch"