[ARVADOS] updated: ff742a82d66bf6b4915d820ec401056323793819
git at public.curoverse.com
git at public.curoverse.com
Tue Aug 26 20:09:06 EDT 2014
Summary of changes:
.../app/assets/stylesheets/select_modal.css.scss | 4 ++++
.../app/controllers/application_controller.rb | 2 +-
.../views/application/_report_issue_popup.html.erb | 14 +++++++-------
apps/workbench/app/views/collections/show.html.erb | 1 -
apps/workbench/app/views/projects/_choose.html.erb | 10 ++++------
.../app/views/projects/_index_projects.html.erb | 4 ++--
apps/workbench/app/views/projects/show.html.erb | 1 -
apps/workbench/config/application.default.yml | 2 +-
sdk/cli/bin/crunch-job | 21 ++++++++++++++-------
services/api/config/application.default.yml | 2 +-
10 files changed, 34 insertions(+), 27 deletions(-)
via ff742a82d66bf6b4915d820ec401056323793819 (commit)
via 02cbe072fd22be8528c1fe8bc404faa2de7b9dec (commit)
via a5819ec1e48fba90658fcf676ffc50c1f216d484 (commit)
via a942e37250873d383bd885ba0dba70c63b3c073d (commit)
via d95bc29acd07b2bb1a47d0de819ae2879cd91009 (commit)
via f45666bea5f997e974333a588def7df50a03a90d (commit)
via 12d4dfd41760188fea509e678a72bb78af3e7c33 (commit)
via 0b7ca85a3b7037bdc2d1a1f65c67196d2719deca (commit)
via 4dc0af33b57ffe9f55f43ce1df69fd05f36b3995 (commit)
from b15e80cdfa29e4bd39f207c8e1d5970373d0d7a1 (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 ff742a82d66bf6b4915d820ec401056323793819
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Aug 26 18:57:37 2014 -0400
Fix label for API endpoint. Re-order fields. refs #3112
diff --git a/apps/workbench/app/views/application/_report_issue_popup.html.erb b/apps/workbench/app/views/application/_report_issue_popup.html.erb
index 56c5393..f032d61 100644
--- a/apps/workbench/app/views/application/_report_issue_popup.html.erb
+++ b/apps/workbench/app/views/application/_report_issue_popup.html.erb
@@ -69,28 +69,28 @@
<% end %>
<div class="form-group">
- <label for="server_version" class="col-sm-4 control-label"> API version </label>
+ <label for="wb_version" class="col-sm-4 control-label"> Workbench version </label>
<div class="col-sm-8">
- <p class="form-control-static" name="server_version"><%=api_version%></p>
+ <p class="form-control-static" name="wb_version"><%=wb_version%></p>
</div>
</div>
<div class="form-group">
- <label for="generated_at" class="col-sm-4 control-label"> API startup time </label>
+ <label for="server_version" class="col-sm-4 control-label"> API version </label>
<div class="col-sm-8">
- <p class="form-control-static" name="generated_at"><%=generated_at%></p>
+ <p class="form-control-static" name="server_version"><%=api_version%></p>
</div>
</div>
<div class="form-group">
- <label for="wb_version" class="col-sm-4 control-label"> Workbench version </label>
+ <label for="generated_at" class="col-sm-4 control-label"> API startup time </label>
<div class="col-sm-8">
- <p class="form-control-static" name="wb_version"><%=wb_version%></p>
+ <p class="form-control-static" name="generated_at"><%=generated_at%></p>
</div>
</div>
<div class="form-group">
- <label for="arvados_base" class="col-sm-4 control-label"> Workbench URI </label>
+ <label for="arvados_base" class="col-sm-4 control-label"> API address </label>
<div class="col-sm-8">
<p class="form-control-static" name="arvados_base"><%=arvados_base%></p>
</div>
commit 02cbe072fd22be8528c1fe8bc404faa2de7b9dec
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Aug 26 18:51:53 2014 -0400
Ensure source_version is a string, even when it consists entirely of decimal digits. refs #3112
diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 33ab2ce..1be5454 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -134,7 +134,7 @@ common:
user_profile_form_message: Welcome to Arvados. All <span style="color:red">required fields</span> must be completed before you can proceed.
# source_version
- source_version: <%= `git log -n 1 --format=%h` %>
+ source_version: "<%= `git log -n 1 --format=%h` %>"
local_modified: false
# report notification to and from addresses
diff --git a/services/api/config/application.default.yml b/services/api/config/application.default.yml
index f836a66..2cf2ce2 100644
--- a/services/api/config/application.default.yml
+++ b/services/api/config/application.default.yml
@@ -194,5 +194,5 @@ common:
auto_setup_name_blacklist: [arvados, git, gitolite, gitolite-admin, root, syslog]
# source_version
- source_version: <%= `git log -n 1 --format=%h` %>
+ source_version: "<%= `git log -n 1 --format=%h` %>"
local_modified: false
commit a5819ec1e48fba90658fcf676ffc50c1f216d484
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Aug 26 14:15:15 2014 -0400
Run the task setup script inside the container (if any), instead of
running setup on the host, using bind-mount for CRUNCH_SRC, and
assuming other directories have already been set up in the docker
image.
No issue #
diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 638353d..da168df 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -487,6 +487,8 @@ else
croak ("could not figure out commit id for $treeish");
}
+ # Note: this section is almost certainly unnecessary if we're
+ # running tasks in docker containers.
my $installpid = fork();
if ($installpid == 0)
{
@@ -654,8 +656,6 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
if ($build_script)
{
$build_script_to_send = $build_script;
- $command .=
- "&& perl -";
}
$command .= "&& exec arv-mount --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
if ($docker_hash)
@@ -668,7 +668,6 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
$command .=
q{$(ip -o address show scope global |
gawk 'match($4, /^([0-9\.:]+)\//, x){print "--dns", x[1]}') };
- $command .= "--volume=\Q$ENV{CRUNCH_SRC}:/tmp/crunch-src:ro\E ";
$command .= "--volume=\Q$ENV{TASK_KEEPMOUNT}:/keep:ro\E ";
$command .= "--env=\QHOME=/home/crunch\E ";
while (my ($env_key, $env_val) = each %ENV)
@@ -686,11 +685,13 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
$command .= "--env=\QCRUNCH_SRC=/tmp/crunch-src\E ";
$command .= "\Q$docker_hash\E ";
$command .= "stdbuf --output=0 --error=0 ";
+ $command .= "perl - ";
$command .= "/tmp/crunch-src/crunch_scripts/" . $Job->{"script"};
} else {
# Non-docker run
$command .= "crunchstat -cgroup-root=/sys/fs/cgroup -poll=10000 ";
$command .= "stdbuf --output=0 --error=0 ";
+ $command .= "perl - ";
$command .= "$ENV{CRUNCH_SRC}/crunch_scripts/" . $Job->{"script"};
}
@@ -1504,9 +1505,11 @@ my $commit = $ENV{"CRUNCH_SRC_COMMIT"};
my $repo = $ENV{"CRUNCH_SRC_URL"};
my $task_work = $ENV{"TASK_WORK"};
-if ($task_work) {
- make_path $task_work;
- -e $task_work or die "Failed to create temporary working directory ($task_work): $!";
+for my $dir ($destdir, $task_work) {
+ if ($dir) {
+ make_path $dir;
+ -e $dir or die "Failed to create temporary directory ($dir): $!";
+ }
}
open L, ">", "$destdir.lock" or die "$destdir.lock: $!";
@@ -1558,7 +1561,11 @@ if ($commit) {
close L;
-exit 0;
+if (@ARGV) {
+ exec(@ARGV);
+} else {
+ exit 0;
+}
sub shell_or_die
{
commit a942e37250873d383bd885ba0dba70c63b3c073d
Merge: b15e80c d95bc29
Author: Tom Clegg <tom at curoverse.com>
Date: Tue Aug 26 19:51:26 2014 -0400
Merge branch '3627-selectable-projects' closes #3627
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list