From: Ian Campbell Date: Fri, 25 Sep 2015 10:21:08 +0000 (+0100) Subject: Do not run baseline tests on osstest branch. X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=261279cf0aa02ebd2da7f7944674836dfae2dcb6;p=osstest.git 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 Acked-by: Ian Jackson --- diff --git a/branch-settings.osstest b/branch-settings.osstest index 060ff4b..0e46e23 100644 --- 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