make-fligh: Fix freebsd guest test test-id

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>
Acked-by: Roger Pau Monné <roger.pau@citrix.com>

diff --git a/make-flight b/make-flight
index d7eeb4ebbd90fd4700fe1abc2f24d6b20e1c83ae..155a0c1f44c31fe9125abfa96400ff022d3989f0 100755 (executable)
--- 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