osstest: abstract code to create a FreeBSD build job

Into a helper. A diff of the runvars of flights generated with and
without the patch show no differences.

No functional change.

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

diff --git a/make-freebsd-flight b/make-freebsd-flight
index 1a2b359ca1db8226e6d248b799a374e029737726..6c530ebece78d5a60ced496f70c35d41211acb9d 100755 (executable)
--- a/make-freebsd-flight
+++ b/make-freebsd-flight
@@ -38,28 +38,14 @@ job_create_build_filter_callback () {
 
 for arch in "$arches"; do
     set_freebsd_runvars
-    job_create_build build-$arch-freebsd build-freebsd          \
-                arch=$arch                                      \
-                $RUNVARS $BUILD_RUNVARS $BUILD_FREEBSD_RUNVARS  \
-                $arch_runvars                                   \
-                tree_freebsd=$TREE_FREEBSD                      \
-                revision_freebsd=$REVISION_FREEBSD              \
-                host_hostflags=arch-$arch,purpose-build         \
-                all_host_os=freebsd                             \
-                $freebsd_runvars
+
+    create_freebsd_build_job build-$arch-freebsd
 
     # Create an identical job that's going to use the build output from
     # the previous one.
-    job_create_build build-$arch-freebsd-again build-freebsd    \
-                arch=$arch                                      \
-                $RUNVARS $BUILD_RUNVARS $BUILD_FREEBSD_RUNVARS  \
-                $arch_runvars                                   \
-                tree_freebsd=$TREE_FREEBSD                      \
-                revision_freebsd=$REVISION_FREEBSD              \
-                host_hostflags=arch-$arch,purpose-build         \
-                all_host_os=freebsd                             \
-                freebsdbuildjob=build-$arch-freebsd             \
-                recipe_testinstall=true
+    freebsd_runvars="$freebsd_runvars freebsdbuildjob=build-$arch-freebsd \
+                     recipe_testinstall=true"
+    create_freebsd_build_job build-$arch-freebsd-again
 done
 
 echo $flight

diff --git a/mfi-common b/mfi-common
index 01ab5d15d03db58fa8189e6db9d29e9409b568ca..3038f713d6920766b02c7f2b475e02f00c6a8bd8 100644 (file)
--- a/mfi-common
+++ b/mfi-common
@@ -180,6 +180,20 @@ set_freebsd_runvars () {
     fi
 }
 
+create_freebsd_build_job () {
+  local name=$1
+
+  job_create_build $name build-freebsd                                  \
+    arch=$arch                                                          \
+    $RUNVARS $BUILD_RUNVARS $BUILD_FREEBSD_RUNVARS                      \
+    $arch_runvars                                                       \
+    tree_freebsd=$TREE_FREEBSD                                          \
+    revision_freebsd=$REVISION_FREEBSD                                  \
+    host_hostflags=arch-$arch,purpose-build                             \
+    all_host_os=freebsd                                                 \
+    $freebsd_runvars
+}
+
 create_build_jobs () {
 
   local arch