> Change this, by selecting between C xenstored and Ocaml xenstored
"at random"
Acked-by: Christian Lindig <christian.lin...@citrix.com>
________________________________________
From: Ian Jackson <i...@xenproject.org>
Sent: 22 January 2021 15:56
To: xen-devel@lists.xenproject.org
Cc: Ian Jackson; Edwin Torok; Christian Lindig; Andrew Cooper; Jürgen Groß; Wei
Liu; Ian Jackson
Subject: [OSSTEST PATCH 7/7] make-flight: Stripy xenstored
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 <edvin.to...@citrix.com>
CC: Christian Lindig <christian.lin...@citrix.com>
CC: Andrew Cooper <andrew.coop...@citrix.com>
CC: Jürgen Groß <jgr...@suse.com>
CC: Wei Liu <w...@xen.org>
Signed-off-by: Ian Jackson <i...@xenproject.org>
Release-Acked-by: Ian Jackson <ian.jack...@eu.citrix.com>
---
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 " <n>", 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 () {
--
2.20.1
