cr-*, ap-*: Facilities for testing linux-next

* Define the new branch's git source repo in ap-common.

* Provide a branch-settings file which disables running additional
  baseline tests, listing changesets in flight reports, pushing,
  and which arranges for the baseline revision for the flight
  report to be determined "late", ie after the to-be-tested
  versions of everything have been decided.

* When the baseline revision is to be determined "late", run
  the new script ap-fetch-version-baseline-late.  This is another
  collection of per-branch rules.  We introduce currently one
  per-branch rule, for linux-next:

* The baseline version for a test of linux-next is
    - the version tested by the most recent flight on the
      linux-linus branch;
    - provided that said version is an ancestor of the linux-next
      version under test;
    - otherwise we try an earlier linux-linus flight.

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

diff --git a/ap-common b/ap-common
index cb0cfffcd20501369cb8c6ff897ccf248721d23e..254eaf42a66b11039833ca04258db28c47dce318 100644 (file)
--- a/ap-common
+++ b/ap-common
@@ -87,6 +87,11 @@ info_linux_tree () {
                : ${GITFORCEFLAG_TREE_LINUX_THIS:=-f}
                ;;
 
+       linux-next)
+               : ${TREE_LINUX_THIS:=${KERNEL_SCM}/next/linux-next.git}
+               : ${GITFORCEFLAG_TREE_LINUX_THIS:=-f}
+               ;;
+
        *)
                return 1
                ;;

diff --git a/ap-fetch-version-baseline-late b/ap-fetch-version-baseline-late
new file mode 100755 (executable)
index 0000000..ef1a8b1
--- /dev/null
+++ b/ap-fetch-version-baseline-late
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+# This is part of "osstest", an automated testing framework for Xen.
+# Copyright (C) 2009-2013 Citrix Inc.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+set -e
+
+branch=$1
+new=$2
+
+. cri-lock-repos
+. cri-common
+select_xenbranch
+. ap-common
+
+case "$branch" in
+
+linux-next)
+       GIT_DIR=$repos/linux \
+       ./sg-check-tested --branch=linux-linus \
+               --blessings=${OSSTEST_BLESSING-real} \
+               --git-ancestor-of=$new --print-revision=linux
+       exit 0
+       ;;
+
+*)
+       echo >&2 "branch $branch ?"
+       exit 1
+       ;;
+esac

diff --git a/branch-settings.linux-next b/branch-settings.linux-next
new file mode 100644 (file)
index 0000000..e9bf926
--- /dev/null
+++ b/branch-settings.linux-next
@@ -0,0 +1,4 @@
+OSSTEST_NO_BASELINE=y
+OSSTEST_PUSH=false
+OLD_REVISION=determine-late
+GITFORCEFLAG=--fail

diff --git a/cr-daily-branch b/cr-daily-branch
index 1d5ceb34385d3b78d04e014ae0387e93122fb096..25be1945a103f301b9358a903543e0d73e3a0f23 100755 (executable)
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -171,6 +171,10 @@ linuxfirmware)
        ;;
 esac
 
+if [ "x$OLD_REVISION" = xdetermine-late ]; then
+       OLD_REVISION="`./ap-fetch-version-baseline-late $branch $NEW_REVISION`"
+fi
+
 if [ "x$NEW_REVISION" = "x$OLD_REVISION" ]; then
         wantpush=false
        for checkbranch in x $BRANCHES_ALWAYS; do