[Xen-devel] [OSSTEST PATCH 7/8] ap-fetch-version-old: Do not honour OSSTEST_USE_HEAD

[Ian Jackson <ian.jackson@xxxxxxxxxxxxx>]

When doing an OSSTEST_USE_HEAD test in infrastructure mode we would
like to use the real osstest mainline baseline as a reference for the
flight reports.  (Rather than simply using the very version under test
as the baseline.)

So revert cf805fa8 "Allow forcing the use of current osstest HEAD for
branch=osstest" as far as it touches ap-fetch-version-old.

In standalone mode: tests now set OLD_REVISION=NONE in their calls to
cr-daily-branch, so ap-fetch-version-old will not be run, and things
will continue to work as before.

Signed-off-by: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
---
 ap-fetch-version-old |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 7b7f50e..8ca9468 100755
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -98,12 +98,8 @@ ovmf)
                $BASE_TREE_OVMF xen-tested-master $BASE_LOCALREV_OVMF
        ;;
 osstest)
-       if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then
-           git fetch -f $HOME/testing.git incoming:ap-fetch
-            git rev-parse ap-fetch^0
-       else
-           git rev-parse HEAD^0
-       fi
+       git fetch -f $HOME/testing.git incoming:ap-fetch
+        git rev-parse ap-fetch^0
         ;;
 *)
        echo >&2 "branch $branch ?"
-- 
1.7.10.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel