linux-next tests: Use correct branch for baseline

Make cr-daily-branch honour an environment or setting variable
EXTRA_SGR_ARGS.  In branch-settings.linux-next set it appropriately to
arrange that the linux-next test reports consider linux-linus tests as
interesting as well as just linux-next ones.

(We already use a flight from linux-linus for selecting the baseline
linux version.)

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

diff --git a/branch-settings.linux-next b/branch-settings.linux-next
index e9bf926a53fe3d58f45ddf6d1f68e3dffe3e7005..1c5660b55038364851d225a8e3d2a9774356e259 100644 (file)
--- a/branch-settings.linux-next
+++ b/branch-settings.linux-next
@@ -2,3 +2,4 @@ OSSTEST_NO_BASELINE=y
 OSSTEST_PUSH=false
 OLD_REVISION=determine-late
 GITFORCEFLAG=--fail
+EXTRA_SGR_ARGS=--branches-also=linux-linus

diff --git a/cr-daily-branch b/cr-daily-branch
index d00ecbb4809cdab814f672cb3570eb78ad63d8df..17bb2c9bf65110a09c728dff5acb1c53214decd8 100755 (executable)
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -301,6 +301,8 @@ END
         ;;
 esac
 
+sgr_args+=" $EXTRA_SGR_ARGS"
+
 : $flight $branch $OSSTEST_BLESSING $sgr_args
 $DAILY_BRANCH_PREEXEC_HOOK
 execute_flight $flight $OSSTEST_BLESSING