make-*flight: Reorder.

I just got tripped up again by putting a build job filter definition
after the call to create_build_jobs. Reorder the make-*flight scripts
to reduce the probability of me doing so any more times.

The general order of these scripts is now:
  - job filter callbacks
  - test job creation
  - top-level code which drives the process.

No change to the output of standalone-generate-dump-flight-runvars.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/make-distros-flight b/make-distros-flight
index 90e28c32465e894138d160e7a506a10fe385f6b2..9e1d77e3f9fc5dd1143dac8b3b3c2638ecdd7344 100755 (executable)
--- a/make-distros-flight
+++ b/make-distros-flight
@@ -50,18 +50,6 @@ job_create_build_filter_callback () {
   return 0
 }
 
-if [ x$buildflight = x ]; then
-
-  WANT_XEND=false REVISION_LINUX_OLD=disable
-
-  create_build_jobs
-
-else
-
-  bfi=$buildflight.
-
-fi
-
 job_create_test_filter_callback () {
   if [ "$xenarch" = "i386" ]; then return 1; fi
   return 0
@@ -201,6 +189,18 @@ test_matrix_do_one () {
   done
 }
 
+if [ x$buildflight = x ]; then
+
+  WANT_XEND=false REVISION_LINUX_OLD=disable
+
+  create_build_jobs
+
+else
+
+  bfi=$buildflight.
+
+fi
+
 test_matrix_iterate
 
 echo $flight

diff --git a/make-flight b/make-flight
index 4b65f64f34b575cd6eef6eb3b1f189ca36321b07..407d67e41084a43290b19378525e4cdae9c34710 100755 (executable)
--- a/make-flight
+++ b/make-flight
@@ -58,16 +58,6 @@ job_create_build_filter_callback () {
   return 0
 }
 
-if [ x$buildflight = x ]; then
-
-  create_build_jobs
-
-else
-
-  bfi=$buildflight.
-
-fi
-
 job_create_test_filter_callback () {
   local job=$1; shift
   local recipe=$1; shift
@@ -678,6 +668,16 @@ test_matrix_do_one () {
   do_pvgrub_tests
 }
 
+if [ x$buildflight = x ]; then
+
+  create_build_jobs
+
+else
+
+  bfi=$buildflight.
+
+fi
+
 test_matrix_iterate
 
 echo $flight