[Xen-devel] [PATCH OSSTEST] Allow forcing the use of current osstest HEAD for branch=osstest

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

Otherwise cr-daily-branch expects $HOME/testing.git to exist and will
git-reset it etc, which is rather annoying when in standalone mode...

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 ap-fetch-version     | 8 ++++++--
 ap-fetch-version-old | 8 ++++++--
 cr-daily-branch      | 4 +++-
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ap-fetch-version b/ap-fetch-version
index 1f3c6e9..5a5d5c4 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -70,8 +70,12 @@ linuxfirmware)
                $UPSTREAM_TREE_LINUXFIRMWARE master daily-cron.$branch
        ;;
 osstest)
-       git-fetch $HOME/testing.git pretest:ap-fetch >&2
-        git-rev-parse ap-fetch^0
+       if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then
+           git-fetch $HOME/testing.git pretest:ap-fetch >&2
+            git-rev-parse ap-fetch^0
+       else
+           git-rev-parse HEAD^0
+       fi
         ;;
 *)
        echo >&2 "branch $branch ?"
diff --git a/ap-fetch-version-old b/ap-fetch-version-old
index 353a817..0f5af49 100755
--- a/ap-fetch-version-old
+++ b/ap-fetch-version-old
@@ -74,8 +74,12 @@ linuxfirmware)
                $TREE_LINUXFIRMWARE master daily-cron-old.$branch
        ;;
 osstest)
-       git-fetch -f $HOME/testing.git incoming:ap-fetch
-        git-rev-parse ap-fetch^0
+       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
         ;;
 *)
        echo >&2 "branch $branch ?"
diff --git a/cr-daily-branch b/cr-daily-branch
index c4a0872..41ca796 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -146,7 +146,9 @@ osstest)
        determine_version REVISION_OSSTEST osstest
         realtree=
        NEW_REVISION=$REVISION_OSSTEST
-       git reset --hard $REVISION_OSSTEST
+       if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then
+           git reset --hard $REVISION_OSSTEST
+       fi
        ;;
 qemuu)
        realtree=qemu-upstream-${xenbranch#xen-}
-- 
1.8.5.2


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