arvados-cli 0.1.20140903124817 → 0.1.20140904113336

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4ff3bb98c86fa603011a9e3646a7d1c2799c6c2
-  data.tar.gz: fb4e0076706947f4d8220d2224b12d11c47de68f
+  metadata.gz: d5e24abbef098fca7cd0d9aa7439c3c62465bd0d
+  data.tar.gz: 5e2a48f1ecbce58fcc120c6c30e2259a83d5626e
 SHA512:
-  metadata.gz: b694c6b44aa8a733dded36b3e1d85fea81779ae4b7dc36bff8857643bc6d30bfee600de921b03d375f598498d64be8641d618bc19a6f64158c0f24b8283663be
-  data.tar.gz: 8f1b3448d94194d403b45c84986b4c6292078d80002da76987b9b1c5e5241048d898281b7d36f1e944df2e89d3e80bcc35ec87b7a2e2a05562fbe1942501e5c9
+  metadata.gz: 18cf01011f8dfd82bc48f12bb934e675601c425a6c901990a3247c511fee5ae8f0b768051ba07767eb1f106b1fb998e520ebf825e412102f47796257e1f3907a
+  data.tar.gz: 2535f9a99a5ab3847c2217d438ea5705a297471d893b5bd85da336e0cfc2e3834232a2f0c6931311b07fbf93b43ab07673d6f41f8919076f5a1c03ae4c62a035

data/bin/crunch-job

@@ -656,6 +656,8 @@ 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,12 +670,16 @@ 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)
       {
         if ($env_key =~ /^(ARVADOS|JOB|TASK)_/) {
-          if ($env_key eq "TASK_KEEPMOUNT") {
+          if ($env_key eq "TASK_WORK") {
+            $command .= "--env=\QTASK_WORK=/tmp/crunch-job\E ";
+          }
+          elsif ($env_key eq "TASK_KEEPMOUNT") {
             $command .= "--env=\QTASK_KEEPMOUNT=/keep\E ";
           }
           else {
@@ -685,13 +691,11 @@ 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 - " if ($build_script);
       $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 - " if ($build_script);
       $command .= "$ENV{CRUNCH_SRC}/crunch_scripts/" . $Job->{"script"};
     }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arvados-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.20140903124817
+  version: 0.1.20140904113336
 platform: ruby
 authors:
 - Arvados Authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arvados
@@ -166,7 +166,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
-description: This is the Arvados SDK CLI gem, git revision 0fdafcb846ec6bb34e4b8ae91ad62c1ccd328355
+description: This is the Arvados SDK CLI gem, git revision 0eb5711ade0f74e556b0a1c10909dbf0bdecb63f
 email: gem-dev@curoverse.com
 executables:
 - arv