Make sure the arvados-src package actually contains the latest source. Duh.

no issue #

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 3891d979b81dd030aebbf17aa0dc38a0439842f8..5a331c152041496c94189b89c1c6863cf4d64c1a 100755 (executable)
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -128,13 +128,20 @@ if [[ ! -d "$WORKSPACE/src-build-dir" ]]; then
 fi  
 
 cd "$WORKSPACE/src-build-dir"
-git fetch -a
-git checkout $GIT_REV
+# just in case, check out master
+git checkout master
+git pull
+# go into detached-head state
+git checkout `git log --format=format:%h -n1 .`
 cd $WORKSPACE
 
 cd $WORKSPACE/debs
 build_and_scp_deb $WORKSPACE/src-build-dir/=/usr/local/arvados/src arvados-src 'Curoverse, Inc.' 'dir' "-v 0.1.$GIT_HASH -x 'usr/local/arvados/src/.git*'"
 
+# clean up, check out master and step away from detached-head state
+cd "$WORKSPACE/src-build-dir"
+git checkout master
+
 # Keep
 cd $WORKSPACE/services/keep
 ./go.sh install keep