[ARVADOS] updated: 05e4ffd616ed333165532720ce3ec6819831d88f
git at public.curoverse.com
git at public.curoverse.com
Mon Feb 24 15:21:41 EST 2014
Summary of changes:
.../install-crunch-dispatch.html.textile.liquid | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
via 05e4ffd616ed333165532720ce3ec6819831d88f (commit)
via a82f7725c2a4c4c7f27d1219c8ffe51a22c52b16 (commit)
from e03fdab8240f07c5cb1e88b502c6d6b145e1e957 (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 05e4ffd616ed333165532720ce3ec6819831d88f
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Feb 24 12:14:04 2014 -0800
Use rvm-exec to eliminate extra bash process provided by "rvm do". closes #2095
diff --git a/doc/install/install-crunch-dispatch.html.textile.liquid b/doc/install/install-crunch-dispatch.html.textile.liquid
index ea1a007..f8cc143 100644
--- a/doc/install/install-crunch-dispatch.html.textile.liquid
+++ b/doc/install/install-crunch-dispatch.html.textile.liquid
@@ -54,7 +54,7 @@ set -e
while sleep 60
do
cd /path/to/arvados/services/api
- setuidgid www-data env RAILS_ENV=production /usr/local/rvm/bin/rvm 2.0.0 do bundle exec ./script/import_commits.rb 2>&1
+ setuidgid www-data env RAILS_ENV=production /usr/local/rvm/bin/rvm-exec 2.0.0 bundle exec ./script/import_commits.rb 2>&1
done
</pre>
@@ -97,5 +97,6 @@ fuser -TERM -k $CRUNCH_DISPATCH_LOCKFILE || true
# export ARVADOS_API_HOST_INSECURE=yes
cd /path/to/arvados/services/api
-RAILS_ENV=production /usr/local/rvm/bin/rvm 2.0.0 do bundle exec ./script/crunch-dispatch.rb 2>&1
+export RAILS_ENV=production
+exec /usr/local/rvm/bin/rvm-exec 2.0.0 bundle exec ./script/crunch-dispatch.rb 2>&1
</pre>
commit a82f7725c2a4c4c7f27d1219c8ffe51a22c52b16
Author: Tom Clegg <tom at curoverse.com>
Date: Mon Feb 24 12:12:28 2014 -0800
Update Python SDK install step, add virtualenv dependency
diff --git a/doc/install/install-crunch-dispatch.html.textile.liquid b/doc/install/install-crunch-dispatch.html.textile.liquid
index 893a8aa..ea1a007 100644
--- a/doc/install/install-crunch-dispatch.html.textile.liquid
+++ b/doc/install/install-crunch-dispatch.html.textile.liquid
@@ -18,7 +18,7 @@ h4. Python SDK dependencies
On controller and all compute nodes:
* @apt-get install python-pip@
-* @pip install --upgrade google-api-python-client@
+* @pip install --upgrade virtualenv arvados-python-client@
h4. Likely crunch job dependencies
@@ -89,7 +89,6 @@ set -e
export PATH="$PATH":/path/to/arvados/services/crunch
export PERLLIB=/path/to/arvados/sdk/perl/lib:/path/to/warehouse-apps/libwarehouse-perl/lib
export ARVADOS_API_HOST={{ site.arvados_api_host }}
-export PYTHONPATH=/path/to/arvados/src/sdk/python
export CRUNCH_DISPATCH_LOCKFILE=/var/lock/crunch-dispatch
fuser -TERM -k $CRUNCH_DISPATCH_LOCKFILE || true
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list