[1/2] freebsd10: refactor code to generate jobs

Commit Message

Roger Pau Monné May 28, 2020, 10:26 a.m. UTC

Slightly adjust the code to generate the freebsd10 jobs in order to
avoid exiting early from the function if the dom0 arch is different
than i386. No functional change expected, the freebsd10 jobs are still
limited to run on an i386 dom0. No runvar diff created as part of this
change.

This is a preparatory change for adding new FreeBSD 11 and 12 jobs
that will instead use an amd64 dom0.

Signed-off-by: Roger Pau Monné <[e-mail]>
---
 make-flight | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

Patch

diff --git a/make-flight b/make-flight
index a361bcb1..af74bb4e 100755
--- a/make-flight
+++ b/make-flight
@@ -230,19 +230,18 @@  test_matrix_branch_filter_callback () {
 
 do_freebsd_tests () {
 
-  if [ $xenarch != amd64 -o $dom0arch != i386 -o "$kern" != "" ]; then
+  if [ $xenarch != amd64 -o "$kern" != "" ]; then
     return
   fi
 
-  for freebsdarch in amd64 i386; do
-
- job_create_test test-$xenarch$kern-$dom0arch$qemuu_suffix-freebsd10-$freebsdarch \
-                        test-freebsd xl $xenarch $dom0arch \
-                        freebsd_arch=$freebsdarch \
+  if [ $dom0arch == i386 ]; then
+    for freebsdarch in amd64 i386; do
+      job_create_test test-$xenarch$kern-$dom0arch$qemuu_suffix-freebsd10-$freebsdarch \
+                      test-freebsd xl $xenarch $dom0arch freebsd_arch=$freebsdarch \
  freebsd_image=${FREEBSD_IMAGE_PREFIX-FreeBSD-10.1-CUSTOM-}$freebsdarch${FREEBSD_IMAGE_SUFFIX--20150525.raw.xz} \
-                        all_hostflags=$most_hostflags,freebsd-10
-
-  done
+                      all_hostflags=$most_hostflags,freebsd-10
+    done
+  fi
 }
 
 do_hvm_winxp_tests () {