* [OSSTEST PATCH v2 1/3] make-fligh: Fix freebsd guest test test-id
2024-03-15 15:48 [OSSTEST PATCH v2 0/3] Switch to Linux 6.1 by default on x86 Anthony PERARD
@ 2024-03-15 15:48 ` Anthony PERARD
2024-03-15 15:48 ` [OSSTEST PATCH v2 2/3] mfi-common: Rework toolstack-disk_format test matrix Anthony PERARD
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Anthony PERARD @ 2024-03-15 15:48 UTC (permalink / raw)
To: xen-devel; +Cc: Roger Pau Monne
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 <anthony.perard@citrix.com>
---
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
--
Anthony PERARD
^ permalink raw reply related [flat|nested] 7+ messages in thread* [OSSTEST PATCH v2 2/3] mfi-common: Rework toolstack-disk_format test matrix
2024-03-15 15:48 [OSSTEST PATCH v2 0/3] Switch to Linux 6.1 by default on x86 Anthony PERARD
2024-03-15 15:48 ` [OSSTEST PATCH v2 1/3] make-fligh: Fix freebsd guest test test-id Anthony PERARD
@ 2024-03-15 15:48 ` Anthony PERARD
2024-03-15 15:48 ` [OSSTEST PATCH v2 3/3] ap-common: Switch to Linux 6.1 by default on x86 + drop dom0 i386 Anthony PERARD
2024-03-18 10:42 ` [OSSTEST PATCH v2 0/3] Switch to Linux 6.1 by default on x86 Roger Pau Monné
3 siblings, 0 replies; 7+ messages in thread
From: Anthony PERARD @ 2024-03-15 15:48 UTC (permalink / raw)
To: xen-devel; +Cc: Roger Pau Monne
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 <anthony.perard@citrix.com>
---
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\"
"
--
Anthony PERARD
^ permalink raw reply related [flat|nested] 7+ messages in thread* [OSSTEST PATCH v2 3/3] ap-common: Switch to Linux 6.1 by default on x86 + drop dom0 i386
2024-03-15 15:48 [OSSTEST PATCH v2 0/3] Switch to Linux 6.1 by default on x86 Anthony PERARD
2024-03-15 15:48 ` [OSSTEST PATCH v2 1/3] make-fligh: Fix freebsd guest test test-id Anthony PERARD
2024-03-15 15:48 ` [OSSTEST PATCH v2 2/3] mfi-common: Rework toolstack-disk_format test matrix Anthony PERARD
@ 2024-03-15 15:48 ` Anthony PERARD
2024-03-15 16:21 ` Juergen Gross
2024-03-18 10:42 ` [OSSTEST PATCH v2 0/3] Switch to Linux 6.1 by default on x86 Roger Pau Monné
3 siblings, 1 reply; 7+ messages in thread
From: Anthony PERARD @ 2024-03-15 15:48 UTC (permalink / raw)
To: xen-devel; +Cc: Roger Pau Monne, Jan Beulich, Andrew Cooper, Juergen Gross
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 <anthony.perard@citrix.com>
---
Notes:
CC: Jan Beulich <jbeulich@suse.com>
CC: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Juergen Gross <jgross@suse.com>
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"
--
Anthony PERARD
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [OSSTEST PATCH v2 3/3] ap-common: Switch to Linux 6.1 by default on x86 + drop dom0 i386
2024-03-15 15:48 ` [OSSTEST PATCH v2 3/3] ap-common: Switch to Linux 6.1 by default on x86 + drop dom0 i386 Anthony PERARD
@ 2024-03-15 16:21 ` Juergen Gross
0 siblings, 0 replies; 7+ messages in thread
From: Juergen Gross @ 2024-03-15 16:21 UTC (permalink / raw)
To: Anthony PERARD, xen-devel; +Cc: Roger Pau Monne, Jan Beulich, Andrew Cooper
[-- Attachment #1.1.1: Type: text/plain, Size: 3168 bytes --]
On 15.03.24 16:48, Anthony PERARD wrote:
> 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 <anthony.perard@citrix.com>
Acked-by: Juergen Gross <jgross@suse.com>
... knowing this is kind of meaningless given that I'm no maintainer of
OSStest, but I'd like to document that I'm fine with the intention of the
change. :-)
Juergen
[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 3743 bytes --]
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [OSSTEST PATCH v2 0/3] Switch to Linux 6.1 by default on x86
2024-03-15 15:48 [OSSTEST PATCH v2 0/3] Switch to Linux 6.1 by default on x86 Anthony PERARD
` (2 preceding siblings ...)
2024-03-15 15:48 ` [OSSTEST PATCH v2 3/3] ap-common: Switch to Linux 6.1 by default on x86 + drop dom0 i386 Anthony PERARD
@ 2024-03-18 10:42 ` Roger Pau Monné
2024-03-18 12:02 ` Anthony PERARD
3 siblings, 1 reply; 7+ messages in thread
From: Roger Pau Monné @ 2024-03-18 10:42 UTC (permalink / raw)
To: Anthony PERARD; +Cc: xen-devel
On Fri, Mar 15, 2024 at 03:48:46PM +0000, Anthony PERARD wrote:
> Patch series available in this git branch:
> https://xenbits.xen.org/git-http/people/aperard/osstest.git br.linux-6.1-v2
>
> Hi,
>
> A set of patch which lead to using Linux 6.1 instead of 4.19 as a default
> kernel on x86.
>
> I've check the list of jobs changes with
> OSSTEST_CONFIG=standalone-config-example nice eatmydata ./standalone-generate-dump-flight-runvars
>
> All branches are affected with changes, most will have the same changes as the
> branch "xen-unstable" (unless the only have a subset of those jobs like
> "libvirt"), and linux-{linus,6.1} will have the changes as listed on
> linux-linus.
>
> Thanks,
>
> xen-unstable:
> - test-amd64-coresched-i386-xl
> - test-amd64-i386-examine
> - test-amd64-i386-examine-bios
> - test-amd64-i386-examine-uefi
> - test-amd64-i386-freebsd10-amd64
> - test-amd64-i386-freebsd10-i386
> - test-amd64-i386-libvirt
> - test-amd64-i386-libvirt-pair
> - test-amd64-i386-libvirt-qemuu-debianhvm-amd64-xsm
> - test-amd64-i386-libvirt-raw
> - test-amd64-i386-libvirt-xsm
> - test-amd64-i386-livepatch
> - test-amd64-i386-migrupgrade
> - test-amd64-i386-pair
> - test-amd64-i386-qemut-rhel6hvm-amd
> - test-amd64-i386-qemut-rhel6hvm-intel
> - test-amd64-i386-qemuu-rhel6hvm-amd
> - test-amd64-i386-qemuu-rhel6hvm-intel
> - 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-vhd
> - test-amd64-i386-xl-xsm
> - test-armhf-armhf-libvirt-qcow2
> - test-armhf-armhf-libvirt-raw
> - test-armhf-armhf-xl-vhd
> + test-amd64-amd64-libvirt-qcow2
> + test-amd64-amd64-libvirt-raw
> + test-amd64-amd64-xl-raw
> + test-amd64-amd64-xl-vhd
> + test-armhf-armhf-libvirt-vhd
> + test-armhf-armhf-xl-qcow2
> + test-armhf-armhf-xl-raw
The shuffling of the armhf disk formats is unfortunate, but I don't
think there's much we can do about it without hardcoding the
combinations to be fixed instead of randomly spread. I don't think
this random spreading was a good idea, as it's easy for unrelated
changes to alter the resulting tests, thus loosing history.
>
> linux-linus:
> - test-amd64-amd64-freebsd11-amd64
> - test-amd64-amd64-freebsd12-amd64
> - test-armhf-armhf-libvirt-qcow2
> - test-armhf-armhf-libvirt-raw
> - test-armhf-armhf-xl-vhd
> + test-amd64-amd64-libvirt-vhd
> + test-amd64-amd64-qemuu-freebsd11-amd64
> + test-amd64-amd64-qemuu-freebsd12-amd64
> + test-amd64-amd64-xl-qcow2
> + test-amd64-amd64-xl-raw
> + test-armhf-armhf-libvirt-vhd
> + test-armhf-armhf-xl-qcow2
> + test-armhf-armhf-xl-raw
>
> Anthony PERARD (3):
> make-fligh: Fix freebsd guest test test-id
> mfi-common: Rework toolstack-disk_format test matrix
> ap-common: Switch to Linux 6.1 by default on x86 + drop dom0 i386
Acked-by: Roger Pau Monné <roger.pau@citrix.com>
Thanks, Roger.
^ permalink raw reply [flat|nested] 7+ messages in thread