[ARVADOS] updated: b34070ef0ed43062e1e923c8771237575dbb5fa7

git at public.curoverse.com git at public.curoverse.com
Mon Jul 28 09:14:10 EDT 2014


Summary of changes:
 sdk/cli/bin/crunch-job | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

       via  b34070ef0ed43062e1e923c8771237575dbb5fa7 (commit)
      from  1a09083539cf6e56fe91a5b5c75c20f35319922b (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 b34070ef0ed43062e1e923c8771237575dbb5fa7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Mon Jul 28 09:13:59 2014 -0400

    Set $CRUNCH_SRC correctly when running the Docker container.  refs #3370

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 462b78c..30f06b8 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -668,15 +668,13 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
           elsif ($env_key eq "TASK_KEEPMOUNT") {
             $command .= "--env=\QTASK_KEEPMOUNT=/keep\E ";
           }
-          elsif ($env_key eq "CRUNCH_SRC") {
-            $command .= "--env=\QCRUNCH_SRC=/tmp/crunch-src\E ";
-          }
           else {
             $command .= "--env=\Q$env_key=$env_val\E ";
           }
         }
       }
       $command .= "--env=\QCRUNCH_NODE_SLOTS=$ENV{CRUNCH_NODE_SLOTS}\E ";
+      $command .= "--env=\QCRUNCH_SRC=/tmp/crunch-src\E ";
       $command .= "\Q$docker_hash\E ";
       $command .= "stdbuf --output=0 --error=0 ";
       $command .= "/tmp/crunch-src/crunch_scripts/" . $Job->{"script"};

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list