[ARVADOS] updated: f5fd953bdf34b6a6b7ba698f76b54f21ee47afc8
git at public.curoverse.com
git at public.curoverse.com
Fri Sep 19 13:51:24 EDT 2014
Summary of changes:
services/api/Gemfile | 4 ++--
services/api/Gemfile.lock | 8 ++++----
services/api/script/crunch-dispatch.rb | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
via f5fd953bdf34b6a6b7ba698f76b54f21ee47afc8 (commit)
from 5bb258b6e289b97e4bda28ff1b2d50a255339030 (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 f5fd953bdf34b6a6b7ba698f76b54f21ee47afc8
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Sep 19 13:49:59 2014 -0400
Use new --run-pipeline-here instead of --run-here flag, which no longer does what crunch-dispatch wants. refs #3550
diff --git a/services/api/Gemfile b/services/api/Gemfile
index eca6d01..67cf109 100644
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -71,8 +71,8 @@ gem 'database_cleaner'
gem 'themes_for_rails'
-gem 'arvados', '>= 0.1.20140917180103'
-gem 'arvados-cli', '>= 0.1.20140917180103'
+gem 'arvados', '>= 0.1.20140919104705'
+gem 'arvados-cli', '>= 0.1.20140919104705'
# pg_power lets us use partial indexes in schema.rb in Rails 3
gem 'pg_power'
diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index e01b95a..9b076ea 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -35,13 +35,13 @@ GEM
addressable (2.3.6)
andand (1.3.3)
arel (3.0.3)
- arvados (0.1.20140917180103)
+ arvados (0.1.20140919112741)
activesupport (>= 3.2.13)
andand
google-api-client (~> 0.6.3)
json (>= 1.7.7)
jwt (>= 0.1.5, < 1.0.0)
- arvados-cli (0.1.20140917180103)
+ arvados-cli (0.1.20140919112741)
activesupport (~> 3.2, >= 3.2.13)
andand (~> 1.3, >= 1.3.3)
arvados (~> 0.1.0)
@@ -223,8 +223,8 @@ PLATFORMS
DEPENDENCIES
acts_as_api
andand
- arvados (>= 0.1.20140917180103)
- arvados-cli (>= 0.1.20140917180103)
+ arvados (>= 0.1.20140919104705)
+ arvados-cli (>= 0.1.20140919104705)
coffee-rails (~> 3.2.0)
database_cleaner
factory_girl_rails
diff --git a/services/api/script/crunch-dispatch.rb b/services/api/script/crunch-dispatch.rb
index a0d95fa..08ea229 100755
--- a/services/api/script/crunch-dispatch.rb
+++ b/services/api/script/crunch-dispatch.rb
@@ -456,7 +456,7 @@ class Dispatcher
pipe_auth = (@pipe_auth_tokens[p.uuid] ||= ApiClientAuthorization.
create(user: User.where('uuid=?', p.modified_by_user_uuid).first,
api_client_id: 0))
- puts `export ARVADOS_API_TOKEN=#{pipe_auth.api_token} && arv-run-pipeline-instance --run-here --no-wait --instance #{p.uuid}`
+ puts `export ARVADOS_API_TOKEN=#{pipe_auth.api_token} && arv-run-pipeline-instance --run-pipeline-here --no-wait --instance #{p.uuid}`
expire_tokens.delete p.uuid
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list