[ARVADOS] updated: 153b599f212ffded5531007e086e2f8da8f8a5cb
git at public.curoverse.com
git at public.curoverse.com
Tue Oct 14 16:13:34 EDT 2014
Summary of changes:
sdk/cli/bin/arv-run-pipeline-instance | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
via 153b599f212ffded5531007e086e2f8da8f8a5cb (commit)
from df54f4111b0afaaf073c7387dff5960bf19a53e2 (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 153b599f212ffded5531007e086e2f8da8f8a5cb
Author: Brett Smith <brett at curoverse.com>
Date: Tue Oct 14 16:15:16 2014 -0400
4126: a-r-p-i dereferences parameter values when creating jobs.
Refs #4126. This is required to run jobs.
diff --git a/sdk/cli/bin/arv-run-pipeline-instance b/sdk/cli/bin/arv-run-pipeline-instance
index e6ec7e5..b70fd7d 100755
--- a/sdk/cli/bin/arv-run-pipeline-instance
+++ b/sdk/cli/bin/arv-run-pipeline-instance
@@ -520,7 +520,9 @@ class WhRunPipelineInstance
my_submit_id = "instance #{@instance[:uuid]} rand #{rand(2**64).to_s(36)}"
job = JobCache.create(@instance, cname, {
:script => c[:script],
- :script_parameters => c[:script_parameters],
+ :script_parameters => Hash[c[:script_parameters].map do |key, spec|
+ [key, spec[:value]]
+ end],
:script_version => c[:script_version],
:repository => c[:repository],
:nondeterministic => c[:nondeterministic],
@@ -596,7 +598,7 @@ class WhRunPipelineInstance
c2[:script_parameters].each do |pname, p|
if p.is_a? Hash and p[:output_of] == cname.to_s
debuglog "parameter #{c2name}::#{pname} == #{c[:job][:output]}"
- c2[:script_parameters][pname] = c[:job][:output]
+ c2[:script_parameters][pname] = {value: c[:job][:output]}
moretodo = true
end
end
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list