arvados-cli 0.1.20140903124817 → 0.1.20140904113336
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/bin/crunch-job +7 -3
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: d5e24abbef098fca7cd0d9aa7439c3c62465bd0d
|
|
4
|
+
data.tar.gz: 5e2a48f1ecbce58fcc120c6c30e2259a83d5626e
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 18cf01011f8dfd82bc48f12bb934e675601c425a6c901990a3247c511fee5ae8f0b768051ba07767eb1f106b1fb998e520ebf825e412102f47796257e1f3907a
|
|
7
|
+
data.tar.gz: 2535f9a99a5ab3847c2217d438ea5705a297471d893b5bd85da336e0cfc2e3834232a2f0c6931311b07fbf93b43ab07673d6f41f8919076f5a1c03ae4c62a035
|
data/bin/crunch-job
CHANGED
|
@@ -656,6 +656,8 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
|
|
|
656
656
|
if ($build_script)
|
|
657
657
|
{
|
|
658
658
|
$build_script_to_send = $build_script;
|
|
659
|
+
$command .=
|
|
660
|
+
"&& perl -";
|
|
659
661
|
}
|
|
660
662
|
$command .= "&& exec arv-mount --allow-other $ENV{TASK_KEEPMOUNT} --exec ";
|
|
661
663
|
if ($docker_hash)
|
|
@@ -668,12 +670,16 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
|
|
|
668
670
|
$command .=
|
|
669
671
|
q{$(ip -o address show scope global |
|
|
670
672
|
gawk 'match($4, /^([0-9\.:]+)\//, x){print "--dns", x[1]}') };
|
|
673
|
+
$command .= "--volume=\Q$ENV{CRUNCH_SRC}:/tmp/crunch-src:ro\E ";
|
|
671
674
|
$command .= "--volume=\Q$ENV{TASK_KEEPMOUNT}:/keep:ro\E ";
|
|
672
675
|
$command .= "--env=\QHOME=/home/crunch\E ";
|
|
673
676
|
while (my ($env_key, $env_val) = each %ENV)
|
|
674
677
|
{
|
|
675
678
|
if ($env_key =~ /^(ARVADOS|JOB|TASK)_/) {
|
|
676
|
-
if ($env_key eq "
|
|
679
|
+
if ($env_key eq "TASK_WORK") {
|
|
680
|
+
$command .= "--env=\QTASK_WORK=/tmp/crunch-job\E ";
|
|
681
|
+
}
|
|
682
|
+
elsif ($env_key eq "TASK_KEEPMOUNT") {
|
|
677
683
|
$command .= "--env=\QTASK_KEEPMOUNT=/keep\E ";
|
|
678
684
|
}
|
|
679
685
|
else {
|
|
@@ -685,13 +691,11 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
|
|
|
685
691
|
$command .= "--env=\QCRUNCH_SRC=/tmp/crunch-src\E ";
|
|
686
692
|
$command .= "\Q$docker_hash\E ";
|
|
687
693
|
$command .= "stdbuf --output=0 --error=0 ";
|
|
688
|
-
$command .= "perl - " if ($build_script);
|
|
689
694
|
$command .= "/tmp/crunch-src/crunch_scripts/" . $Job->{"script"};
|
|
690
695
|
} else {
|
|
691
696
|
# Non-docker run
|
|
692
697
|
$command .= "crunchstat -cgroup-root=/sys/fs/cgroup -poll=10000 ";
|
|
693
698
|
$command .= "stdbuf --output=0 --error=0 ";
|
|
694
|
-
$command .= "perl - " if ($build_script);
|
|
695
699
|
$command .= "$ENV{CRUNCH_SRC}/crunch_scripts/" . $Job->{"script"};
|
|
696
700
|
}
|
|
697
701
|
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: arvados-cli
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.1.
|
|
4
|
+
version: 0.1.20140904113336
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Arvados Authors
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-09-
|
|
11
|
+
date: 2014-09-04 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: arvados
|
|
@@ -166,7 +166,7 @@ dependencies:
|
|
|
166
166
|
- - "<"
|
|
167
167
|
- !ruby/object:Gem::Version
|
|
168
168
|
version: 1.0.0
|
|
169
|
-
description: This is the Arvados SDK CLI gem, git revision
|
|
169
|
+
description: This is the Arvados SDK CLI gem, git revision 0eb5711ade0f74e556b0a1c10909dbf0bdecb63f
|
|
170
170
|
email: gem-dev@curoverse.com
|
|
171
171
|
executables:
|
|
172
172
|
- arv
|