osstest: introduce a helper to create Xen build jobs

This is currently a non-functional change, since no new jobs are
added, and the existing ones should stay unchanged. Runvars of all
flights remain unchanged.

The purpose of the helper is to allow adding different Xen build jobs,
with likely different runvars in the future.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/mfi-common b/mfi-common
index 9d1bfac7992308ccdd1406b8bfc14e8756c32deb..b5af1771875671b5c9193fc53b1273f8f1accf4f 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -202,6 +202,30 @@ create_freebsd_build_job () {
     $freebsd_runvars
 }
 
+create_xen_build_job () {
+  local name=$1; shift
+  local recipe=$1; shift
+  local extra_runvars=$@; shift
+
+  job_create_build $name $recipe                                        \
+    arch=$arch enable_xend=$build_defxend enable_ovmf=$enable_ovmf      \
+    enable_xsm=$enable_xsm $livepatch_runvars                           \
+    tree_qemu=$TREE_QEMU                                                \
+    tree_qemuu=$TREE_QEMU_UPSTREAM                                      \
+    tree_xen=$TREE_XEN                                                  \
+    tree_seabios=$TREE_SEABIOS                                          \
+    tree_ovmf=$TREE_OVMF                                                \
+    tree_minios=$TREE_MINIOS                                            \
+    revision_xen=$REVISION_XEN                                          \
+    revision_qemu=$REVISION_QEMU                                        \
+    revision_qemuu=$REVISION_QEMU_UPSTREAM                              \
+    revision_seabios=$REVISION_SEABIOS                                  \
+    revision_ovmf=$REVISION_OVMF                                        \
+    revision_minios=$REVISION_MINIOS                                    \
+    $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars            \
+    $extra_runvars
+}
+
 create_build_jobs () {
 
   local arch
@@ -320,24 +344,8 @@ create_build_jobs () {
       else
         xsm_suffix=""
       fi
-      job_create_build build-$arch$xsm_suffix build                          \
-                arch=$arch enable_xend=$build_defxend enable_ovmf=$enable_ovmf\
-                enable_xsm=$enable_xsm $livepatch_runvars                   \
-        tree_qemu=$TREE_QEMU                                                 \
-        tree_qemuu=$TREE_QEMU_UPSTREAM                                       \
-        tree_xen=$TREE_XEN                                                   \
-        tree_seabios=$TREE_SEABIOS                                           \
-        tree_ovmf=$TREE_OVMF                                                 \
-        tree_minios=$TREE_MINIOS                                             \
-                $RUNVARS $BUILD_RUNVARS $BUILD_XEN_RUNVARS $arch_runvars     \
-                $hostos_runvars                                              \
-                host_hostflags=$build_hostflags                              \
-                revision_xen=$REVISION_XEN                                   \
-                revision_qemu=$REVISION_QEMU                                 \
-                revision_qemuu=$REVISION_QEMU_UPSTREAM                       \
-                revision_seabios=$REVISION_SEABIOS                           \
-                revision_ovmf=$REVISION_OVMF                                 \
-                revision_minios=$REVISION_MINIOS
+      create_xen_build_job build-$arch$xsm_suffix build                 \
+        $hostos_runvars host_hostflags=$build_hostflags
     done
 
     if [ x$want_prevxen = xy ] ; then