Do not run baseline tests on osstest branch.

If an osstest instance is running flights with
OSSTEST_BASELINES_ONLY=y (e.g. on a secondary site, like the Citrix
Cambridge instance) then it will also be running a regular osstest
flight to merge from the upstream osstest and does not want to also do
baseline testing.

I expect this will be the normal configuration in all sites other than
the master colo production instance, so arrange for it via
branch-settings.osstest rather than some site local configuration file.

In the colo production instance we never set OSSTEST_BASELINES_ONLY=y,
so this has no effect. If we did set that option I think suppressing it
for the osstest branch would still be correct.

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

diff --git a/branch-settings.osstest b/branch-settings.osstest
index 060ff4b2b9431fbb4208ec9dca637b788bf8a66f..0e46e239aa86d9cf25a2f19817e71fd7fc6c8ae5 100644 (file)
--- a/branch-settings.osstest
+++ b/branch-settings.osstest
@@ -1 +1,9 @@
 OSSTEST_EMAIL_HEADER=daily-cron-email-osstest
+
+# Sites which run baseline only tests will usually be running a
+# separate flight to merge osstest from upstream and do not need to do
+# baseline tests of it too.
+if [ x"$OSSTEST_BASELINES_ONLY" = xy ] ; then
+    echo "Not baseline testing osstest"
+    exit 1
+fi