standalone: Always set OSSTEST_NO_BASELINE

OSSTEST_NO_BASELINE disables the thing where cr-daily-branch decides
(based on information from sg-check-tested) that the baseline is
untested and therefore that it ought to do a baseline test instead of
testing the tip.

This whole feature is never correct in standalone mode, where there is
no useful test history database for sg-check-tested to work on.

In the case where the branch was osstest, not specifying --baseline
and therefore not having OSSTEST_NO_BASELINE didn't make all that much
difference because we also have OSSTEST_USE_HEAD=y and currently
ap-fetch-version-old (wrongfully) honours that, so the `baseline' test
would use the head anyway.

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/standalone b/standalone
index caf3fd5c87642ee99dee75097929d2e032833b64..dd36467edb07f59d052afbfbc77e5c688c75a278 100755 (executable)
--- a/standalone
+++ b/standalone
@@ -72,7 +72,6 @@ flight="standalone"
 host=
 reuse=1 # Don't blow away machines by default
 lvextendmax=50 # Leave some LVM space free for running tests
-nobaseline=y
 
 while true ; do
     case "$1" in
@@ -82,7 +81,7 @@ while true ; do
        -r|--reuse)  reuse=1;   shift 1;;
        -R|--noreuse|--reinstall)reuse=0;shift 1;;
        --lvextendmax)lvextendmax=$2; shift 2;;
-       --baseline)nobaseline=n; shift 1;;
+       --baseline) echo >&2 'warning: --baseline is obsolete'; shift 1;;
        --help)      usage; exit 0;;
         --) shift ; break ;;
         *) echo "Internal error!" ; exit 1 ;;
@@ -183,7 +182,7 @@ case $op in
         BUILD_LVEXTEND_MAX="$lvextendmax" \
         OSSTEST_FLIGHT=$flight \
         OSSTEST_CONFIG=$config \
-        OSSTEST_NO_BASELINE=$nobaseline \
+        OSSTEST_NO_BASELINE=y \
             with_logging logs/$flight/make-flight.log ./cr-daily-branch $@ $branch
         ;;