cr-try-bisect-adhoc: Set OSSTEST_PRIORITY=-30

This makes adhoc bisects slightly more important than smoke tests, on
the basis that a smoke test can choose another host while an adhoc
bisect cannot.

Document this is README.planner and while there make a note of the
usage of OSSTEST_RESOURCE_WAITSTART by cr-try-bisect.

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

diff --git a/README.planner b/README.planner
index 3a491a41cb7427a678be4750e553ca0388800a24..d4a3c4bc7a91aaa0decd62de45d8dc3ee9027c46 100644 (file)
--- a/README.planner
+++ b/README.planner
@@ -59,7 +59,8 @@ planning slot.
 
 The queueing order is determined by the job priority value.  Each
 client declares its own priority.  The usual basis for the priority is
-is client's starting time_t.  So by and large jobs execute in order.
+is client's starting time_t.  So by and large jobs execute in
+order. This can be overridden using $OSSTEST_RESOURCE_WAITSTART.
 
 The main client in the planning process is
 ts-hosts-allocate-Executive.  That program contains the heuristics for
@@ -87,11 +88,17 @@ in the more distant future.
 Values for OSSTEST_RESOURCE_PRIORITY:
   mg-allocate                                    -1000000
   mg-blockage                                    -2000000
+  cr-try-bisect-adhoc                                 -30
   xen-unstable-smoke cr-daily-branch                  -20
   default Executive.pm with controlling terminal      -10
   mg-execute-flight                                    -8
   default                                               0
 
+Values for OSSTEST_RESOURCE_WAITSTART:
+  cr-try-bisect                 6000 seconds before the timestamp on the
+                                corresponding $branch.mro file (i.e. 6000
+                                before the end of the real flight which
+                                triggered the bisection attempt).
 
 ms-ownerdaemon and `ownd' tasks
 -------------------------------

diff --git a/cr-try-bisect-adhoc b/cr-try-bisect-adhoc
index d2bbb8a28e77cb95988ae09130d3ef697d6c6802..caadfd80c537ce2be39ce4423a8c5928830f5e09 100755 (executable)
--- a/cr-try-bisect-adhoc
+++ b/cr-try-bisect-adhoc
@@ -58,7 +58,7 @@ compute_state_done_callback () {
 }
 
 perhaps_bisect_step_core_testing_callback () {
-       :
+       export OSSTEST_RESOURCE_PRIORITY=-30
 }
 
 subject_prefix="[adhoc $branch bisection]"