[ARVADOS] updated: bf7687829f5222375441cf75c7d82d82a4f508c4
git at public.curoverse.com
git at public.curoverse.com
Wed Jun 4 15:23:36 EDT 2014
Summary of changes:
.gitignore | 3 ++
.../workbench/app/views/jobs/_show_status.html.erb | 43 +++++++++---------
doc/api/methods/users.html.textile.liquid | 4 --
...rial-gatk-variantfiltration.html.textile.liquid | 42 +----------------
doc/user/topics/tutorial-job1.html.textile.liquid | 12 +----
docker/api/secret_token.rb.in | 5 ++
docker/build_tools/Makefile | 3 +-
docker/config.yml.example | 4 ++
docker/jobs/Dockerfile | 2 +
sdk/cli/bin/arv | 2 -
sdk/cli/bin/crunch-job | 31 ++++++++++---
services/api/Gemfile | 1 -
services/api/Gemfile.lock | 2 -
.../app/controllers/arvados/v1/jobs_controller.rb | 45 ------------------
.../app/controllers/arvados/v1/users_controller.rb | 37 +--------------
services/api/app/models/job.rb | 19 --------
services/api/config/routes.rb | 2 -
services/keep/src/keep/keep.go | 53 ++++++----------------
services/keep/src/keep/volume_unix.go | 14 +-----
19 files changed, 82 insertions(+), 242 deletions(-)
via bf7687829f5222375441cf75c7d82d82a4f508c4 (commit)
via 137cd3ce818d4789355ea8d92cd2e2ea73318c4f (commit)
via f6f4efcf298d5c37b5eb8a88eb164cf8b77ae928 (commit)
via 06750c636edc78256a11aec392be21d63a0cceeb (commit)
via 7ea7c6bc160097c24e2403d6f98f45a4369b4c7d (commit)
via e20bd70e4deaf55e7f162307a10118c66e2faac5 (commit)
via 70dd308c6d20951745d9b8e849131d0b14e7386a (commit)
via a4378cd48648a9ca315713535f651d1bbace322f (commit)
via b01245c1c7bc78b32dbc124527660b0c36b31a58 (commit)
via 436d545670d3637dcd96b429e538b995ee98a49b (commit)
via 22e76f53dad163dd1d6703d792d94527d70bb334 (commit)
via ae2ecdfac7e8fcab495bfa8f6daa812a70123668 (commit)
via b402e6a66e569167c0e990a4fdfc2843df76afd8 (commit)
via 070e2e8e80cfc88414dd2595cae5bfddce1cd94f (commit)
via ff3686b372cd598ee990acd990af2b04daf91ada (commit)
from c7a21e6294f1eb905ace3d717f9dcfb4d4c39f0b (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 bf7687829f5222375441cf75c7d82d82a4f508c4
Merge: 137cd3c 06750c6
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Jun 4 15:23:31 2014 -0400
Merge remote-tracking branch 'origin/master' into 2882-job-process-stats
diff --cc services/api/app/models/job.rb
index dc35398,7bca409..51fb7c2
--- a/services/api/app/models/job.rb
+++ b/services/api/app/models/job.rb
@@@ -35,11 -35,8 +35,9 @@@ class Job < ArvadosMode
t.add :runtime_constraints
t.add :tasks_summary
t.add :dependencies
- t.add :log_stream_href
- t.add :log_buffer
t.add :nondeterministic
t.add :repository
+ t.add :supplied_script_version
end
def assert_finished
commit 137cd3ce818d4789355ea8d92cd2e2ea73318c4f
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Jun 4 15:23:11 2014 -0400
2882: Improved re-run job buttons on job status page
diff --git a/apps/workbench/app/views/jobs/_show_status.html.erb b/apps/workbench/app/views/jobs/_show_status.html.erb
index 99f2414..eff1e75 100644
--- a/apps/workbench/app/views/jobs/_show_status.html.erb
+++ b/apps/workbench/app/views/jobs/_show_status.html.erb
@@ -2,32 +2,33 @@
<div class="pull-right">
<% if @object.running %>
<%= form_tag "/jobs/#{@object.uuid}/cancel", style: "display:inline; padding-left: 1em" do |f| %>
- <%= button_tag "Cancel running job", {class: 'btn btn-danger', id: "cancel-job-button"} %>
+ <%= button_tag "Cancel running job", {class: 'btn btn-danger', id: "cancel-job-button"} %>
<% end %>
<% else %>
- Re-run job using version:
+ Re-run job using script version:
<%= form_tag '/jobs', style: "display:inline; padding-left: 1em" do |f| %>
- <% [:script, :script_version, :repository, :output_is_persistent, :supplied_script_version, :nondeterministic].each do |d| %>
- <%= hidden_field :job, d, :value => @object[d] %>
+ <% [:script, :script_version, :repository, :output_is_persistent, :supplied_script_version, :nondeterministic].each do |d| %>
+ <%= hidden_field :job, d, :value => @object[d] %>
+ <% end %>
+ <% [:script_parameters, :runtime_constraints].each do |d| %>
+ <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
+ <% end %>
+ <%= hidden_field :options, :no_reuse, :value => true %>
+ <%= button_tag "Same as this run", {class: 'btn btn-primary', id: "re-run-same-job-button"} %>
<% end %>
- <% [:script_parameters, :runtime_constraints].each do |d| %>
- <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
- <% end %>
- <%= hidden_field :options, :no_reuse, :value => true %>
- <%= button_tag "Same (#{@object.script_version.slice 0,8}...)", {class: 'btn btn-primary', id: "re-run-same-job-button"} %>
- <% end %>
-
- <%= form_tag '/jobs', style: "display:inline" do |f| %>
- <% [:script, :repository, :output_is_persistent, :supplied_script_version, :nondeterministic].each do |d| %>
- <%= hidden_field :job, d, :value => @object[d] %>
+ <% if !@object.supplied_script_version.nil? and !@object.supplied_script_version.empty? and @object.script_version != @object.supplied_script_version%>
+ <%= form_tag '/jobs', style: "display:inline" do |f| %>
+ <% [:script, :repository, :output_is_persistent, :supplied_script_version, :nondeterministic].each do |d| %>
+ <%= hidden_field :job, d, :value => @object[d] %>
+ <% end %>
+ <%= hidden_field :job, :script_version, :value => @object[:supplied_script_version] %>
+ <% [:script_parameters, :runtime_constraints].each do |d| %>
+ <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
+ <% end %>
+ <%= hidden_field :options, :no_reuse, :value => true %>
+ <%= button_tag "Latest (#{@object.repository}/#{@object.supplied_script_version})", {class: 'btn btn-primary', id: "re-run-latest-job-button"} %>
+ <% end %>
<% end %>
- <%= hidden_field :job, :script_version, :value => @object[:supplied_script_version] %>
- <% [:script_parameters, :runtime_constraints].each do |d| %>
- <%= hidden_field :job, d, :value => JSON.dump(@object[d]) %>
- <% end %>
- <%= hidden_field :options, :no_reuse, :value => true %>
- <%= button_tag "Latest (#{@object.repository}/#{@object.supplied_script_version})", {class: 'btn btn-primary', id: "re-run-latest-job-button"} %>
-<% end %>
<% end %>
</div>
commit f6f4efcf298d5c37b5eb8a88eb164cf8b77ae928
Merge: c7a21e6 a4378cd
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date: Wed Jun 4 15:19:10 2014 -0400
Merge branch 'master' into 2882-job-process-stats refs #2882
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list