[OSSTEST PATCH 1/4] mfi-common: break out dom0arches variable (nfc)

[OSSTEST PATCH 1/4] mfi-common: break out dom0arches variable (nfc)

[Ian Jackson]

This will allow test choices to depend on the actual rather than
entire dom0arches.

No change to output from standalone-generate-dump-flight-runvars.

Signed-off-by: Ian Jackson <iwj@xenproject.org>
---
 mfi-common | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/mfi-common b/mfi-common
index 2834411f..70e17f7a 100644
--- a/mfi-common
+++ b/mfi-common
@@ -643,6 +643,7 @@ test_matrix_iterate () {
       *)          echo >&2 "kernbuild ?  $kern"; exit 1 ;;
       esac
 
+      dom0arches=''
       for dom0arch in i386 amd64 armhf arm64; do
 
         case ${xenarch}_${dom0arch} in
@@ -654,6 +655,11 @@ test_matrix_iterate () {
             *) continue ;;
         esac
 
+        dom0arches+=" $dom0arch"
+      done
+
+      for dom0arch in $dom0arches; do
+
         eval "
             arch_runvars=\"\$ARCH_RUNVARS_$dom0arch\"
         "
-- 
2.20.1

[OSSTEST PATCH 2/4] mfi-common: Change dom0arch list order (nfc)

[Ian Jackson]

Change the order to match fmtarches_outer in do_pv_debian_tests.

We are going to want to add an indirection here but not change
anything.

No change to output from standalone-generate-dump-flight-runvars.

Signed-off-by: Ian Jackson <iwj@xenproject.org>
---
 mfi-common | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mfi-common b/mfi-common
index 70e17f7a..02278420 100644
--- a/mfi-common
+++ b/mfi-common
@@ -644,7 +644,7 @@ test_matrix_iterate () {
       esac
 
       dom0arches=''
-      for dom0arch in i386 amd64 armhf arm64; do
+      for dom0arch in i386 armhf amd64 arm64; do
 
         case ${xenarch}_${dom0arch} in
             amd64_amd64) ;;
-- 
2.20.1

[OSSTEST PATCH 3/4] fmtarches: Use dom0arches, not hardcoded arch list

[Ian Jackson]

This will make us reallocate fmt tests when the arch list changes.
It's not ideal because it means tests jumping about across arches and
might let regressions go through but it's better than just dropping
them, and doing a better approach is complex.

This changes some jobs and adds others, roughly:

  +               test-amd64-i386-libvirt-fraw
  -               test-amd64-i386-xl-raw
  +               test-amd64-i386-xl-vhd
  +               test-arm64-arm64-libvirt-raw
  +               test-arm64-arm64-xl-vhd
  +               test-armhf-armhf-libvirt-qcow2

(as reported by standalone-generate-dump-flight-runvars)

Signed-off-by: Ian Jackson <iwj@xenproject.org>
---
 make-flight | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make-flight b/make-flight
index e0d11c80..ecbb195b 100755
--- a/make-flight
+++ b/make-flight
@@ -652,7 +652,7 @@ do_pv_debian_tests () {
   # Within each fmt we rotate through the list of arches
   # The starting list rotates once per ts, so that we try to
   # exercise each fmt on each arch family.
-  local fmtarches_outer="i386 armhf amd64 arm64"
+  local fmtarches_outer="$dom0arches"
   local endfmt="do_pv_debian_tests-missing-ts-fmt-for-dom0arch="
 
   for ts in xl libvirt ; do
-- 
2.20.1

[OSSTEST PATCH 4/4] mfi-common: Drop Linux dom0 i386 tests for newer Linux branches

[Ian Jackson]

This makes radical changes to the test ste for the linux-linus and
linux-next branches.

Mostly, tests are dropped but some 64-bit dom0 tests are added to
replace them.

Requested-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Ian Jackson <iwj@xenproject.org>
---
 mfi-common | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/mfi-common b/mfi-common
index 02278420..771843f0 100644
--- a/mfi-common
+++ b/mfi-common
@@ -655,6 +655,11 @@ test_matrix_iterate () {
             *) continue ;;
         esac
 
+        case "${branch}_${dom0arch}" in
+          linux-5.4_i386 | linux-[2-4].*_i386) ;; # keep 32-bit for old linux
+          linux-*_i386) continue;;
+        esac
+
         dom0arches+=" $dom0arch"
       done
 
-- 
2.20.1

Re: [OSSTEST PATCH 4/4] mfi-common: Drop Linux dom0 i386 tests for newer Linux branches

[Juergen Gross]

[-- Attachment #1.1.1: Type: text/plain, Size: 399 bytes --]

On 09.09.21 18:47, Ian Jackson wrote:
> This makes radical changes to the test ste for the linux-linus and
> linux-next branches.
> 
> Mostly, tests are dropped but some 64-bit dom0 tests are added to
> replace them.
> 
> Requested-by: Juergen Gross <jgross@suse.com>
> Signed-off-by: Ian Jackson <iwj@xenproject.org>

Thanks!

Reviewed-by: Juergen Gross <jgross@suse.com>


Juergen

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 3135 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]