[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


  • To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
  • Date: Thu, 28 May 2020 12:26:47 +0200
  • Authentication-results: esa1.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none
  • Cc: ian.jackson@xxxxxxxxxxxxx, Roger Pau Monne <roger.pau@xxxxxxxxxx>
  • Delivery-date: Thu, 28 May 2020 10:27:17 +0000
  • Ironport-sdr: fQkIDVo0sLcVE7teoc9gsdNSHk0LZJYVkmGtBwTinVq4F+B1CnCB+KP2sR8tc1D9HVFfThXuOW hmHAiu7yrL7aRKo2Va/oFZ3J3jNq/w25Ay1Y4M6GwzYvOKcu/NNhtg1NI6ngAWUKR8QbmHb9Su VWtmXg75HJpYYzhOICrTfT7Nsffj2TqsECzh9Xzc6QmpgmL/tk8ejiQD3HJK2lWZx86ClGWqU2 PTcZxTFdLCp8nBJQkeJ+7489ZXReTHarvqc53v2WlQNNdTbrlPkS72BePS50YqLzb0qX/N4r2m k6o=
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

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é <roger.pau@xxxxxxxxxx>
---
 make-flight | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

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 () {
-- 
2.26.2




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.