[PATCH 2/2] freebsd: add FreeBSD 11 and 12 guest jobs

[Roger Pau Monne <roger.pau@xxxxxxxxxx>]

Those are based on the upstream images and are run on an amd64 dom0.
The runvar difference is:

+test-amd64-amd64-qemuu-freebsd11-amd64 all_host_di_version 2020-02-10
+test-amd64-amd64-qemuu-freebsd12-amd64 all_host_di_version 2020-02-10
+test-amd64-amd64-qemuu-freebsd11-amd64 all_host_suite      stretch
+test-amd64-amd64-qemuu-freebsd12-amd64 all_host_suite      stretch
+test-amd64-amd64-qemuu-freebsd11-amd64 all_hostflags       
arch-amd64,arch-xen-amd64,suite-stretch,purpose-test,freebsd-11
+test-amd64-amd64-qemuu-freebsd12-amd64 all_hostflags       
arch-amd64,arch-xen-amd64,suite-stretch,purpose-test,freebsd-12
+test-amd64-amd64-qemuu-freebsd11-amd64 arch                amd64
+test-amd64-amd64-qemuu-freebsd12-amd64 arch                amd64
+test-amd64-amd64-qemuu-freebsd11-amd64 buildjob            build-amd64
+test-amd64-amd64-qemuu-freebsd12-amd64 buildjob            build-amd64
+test-amd64-amd64-qemuu-freebsd11-amd64 freebsd_arch        amd64
+test-amd64-amd64-qemuu-freebsd12-amd64 freebsd_arch        amd64
+test-amd64-amd64-qemuu-freebsd11-amd64 freebsd_image       
FreeBSD-11.3-RELEASE-amd64.raw.xz
+test-amd64-amd64-qemuu-freebsd12-amd64 freebsd_image       
FreeBSD-12.1-RELEASE-amd64.raw.xz
+test-amd64-amd64-qemuu-freebsd11-amd64 kernbuildjob        build-amd64-pvops
+test-amd64-amd64-qemuu-freebsd12-amd64 kernbuildjob        build-amd64-pvops
+test-amd64-amd64-qemuu-freebsd11-amd64 kernkind            pvops
+test-amd64-amd64-qemuu-freebsd12-amd64 kernkind            pvops
+test-amd64-amd64-qemuu-freebsd11-amd64 toolstack           xl
+test-amd64-amd64-qemuu-freebsd12-amd64 toolstack           xl
+test-amd64-amd64-qemuu-freebsd11-amd64 xenbuildjob         build-amd64
+test-amd64-amd64-qemuu-freebsd12-amd64 xenbuildjob         build-amd64

Note that only amd64 versions are tested at the moment, i386 had some
bugs that are being fixed so new releases can be tested.

Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
Note this requires adding the freebsd-{11,12} hostflags to amd64
hosts.
---
 make-flight | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/make-flight b/make-flight
index af74bb4e..48dc927c 100755
--- a/make-flight
+++ b/make-flight
@@ -241,7 +241,20 @@ do_freebsd_tests () {
  
freebsd_image=${FREEBSD_IMAGE_PREFIX-FreeBSD-10.1-CUSTOM-}$freebsdarch${FREEBSD_IMAGE_SUFFIX--20150525.raw.xz}
 \
                       all_hostflags=$most_hostflags,freebsd-10
     done
+    return
   fi
+
+  # 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 \
+                    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,freebsd-11
+    job_create_test 
test-$xenarch$kern-$dom0arch$qemuu_suffix-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,freebsd-12
+  done
 }
 
 do_hvm_winxp_tests () {
-- 
2.26.2