[ARVADOS-DEV] updated: 45ab2f46c34ab5336768d095c0232f24efb6e04d

[git at public.curoverse.com]

Summary of changes:
 jenkins/run-build-packages.sh | 28 +++++++++++++---------------
 jenkins/run-tests.sh          |  2 +-
 2 files changed, 14 insertions(+), 16 deletions(-)

       via  45ab2f46c34ab5336768d095c0232f24efb6e04d (commit)
      from  61ed4ec992c01d2bb7c052983de9f917d3407edc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 45ab2f46c34ab5336768d095c0232f24efb6e04d
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Aug 14 15:45:27 2014 -0400

    3551: Use mktemp for GOPATH. Update run-build-packages.sh with new Go recipes.

diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 5a331c1..65d0a9f 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -143,28 +143,26 @@ cd "$WORKSPACE/src-build-dir"
 git checkout master
 
 # Keep
-cd $WORKSPACE/services/keep
-./go.sh install keep
+export GOPATH=$(mktemp -d)
+mkdir -p "$GOPATH/src/git.curoverse.com"
+ln -sfn "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git"
+
+# Keep -> keepstore
+go get "git.curoverse.com/arvados.git/services/keepstore"
 cd $WORKSPACE/debs
-build_and_scp_deb $WORKSPACE/services/keep/bin/keep=/usr/bin/keep keep 'Curoverse, Inc.' 'dir' "-v 0.1.$GIT_HASH"
+build_and_scp_deb $GOPATH/bin/keepstore=/usr/bin/keep keep 'Curoverse, Inc.' 'dir' "-v 0.1.$GIT_HASH"
 
 # Keep proxy
 
-# First build the keepclient library
-cd $WORKSPACE/sdk/go
-./go.sh install arvados.org/keepclient
-
-# Then keepproxy
-cd $WORKSPACE/services/keep
-./go.sh install arvados.org/keepproxy
+# Keep -> keepproxy
+go get "git.curoverse.com/arvados.git/services/keepproxy"
 cd $WORKSPACE/debs
-build_and_scp_deb $WORKSPACE/services/keep/bin/keepproxy=/usr/bin/keepproxy keepproxy 'Curoverse, Inc.' 'dir' "-v 0.1.$GIT_HASH"
+build_and_scp_deb $GOPATH/bin/keepproxy=/usr/bin/keepproxy keepproxy 'Curoverse, Inc.' 'dir' "-v 0.1.$GIT_HASH"
 
-# The crunchstat wrapper
-cd $WORKSPACE/services/crunch/crunchstat
-./go.sh install arvados.org/crunchstat
+# crunchstat
+go get "git.curoverse.com/arvados.git/services/crunchstat"
 cd $WORKSPACE/debs
-build_and_scp_deb $WORKSPACE/services/crunch/crunchstat/bin/crunchstat=/usr/bin/crunchstat crunchstat 'Curoverse, Inc.' 'dir' "-v 0.1.$GIT_HASH"
+build_and_scp_deb $GOPATH/bin/crunchstat=/usr/bin/crunchstat crunchstat 'Curoverse, Inc.' 'dir' "-v 0.1.$GIT_HASH"
 
 # The Python SDK
 cd $WORKSPACE/sdk/python
diff --git a/jenkins/run-tests.sh b/jenkins/run-tests.sh
index 33a25be..bee8002 100755
--- a/jenkins/run-tests.sh
+++ b/jenkins/run-tests.sh
@@ -13,7 +13,7 @@ title () {
 source /etc/profile.d/rvm.sh
 echo $WORKSPACE
 
-export GOPATH="$HOME/gocode"
+export GOPATH=$(mktemp -d)
 mkdir -p "$GOPATH/src/git.curoverse.com"
 ln -sfn "$WORKSPACE" "$GOPATH/src/git.curoverse.com/arvados.git"
 

-----------------------------------------------------------------------


hooks/post-receive
--