[ARVADOS] updated: d62d420af90a635da0593fd1e9bc5650b57ba2bd

git at public.curoverse.com git at public.curoverse.com
Thu Jul 3 10:51:07 EDT 2014


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

       via  d62d420af90a635da0593fd1e9bc5650b57ba2bd (commit)
      from  01f05d1fd88b17f88eb671984c8ceab49e6ef3d4 (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 d62d420af90a635da0593fd1e9bc5650b57ba2bd
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Thu Jul 3 10:51:03 2014 -0400

    Docker job's $HOME is now inside docker container, we don't need a special
    separate $HOME for arv-mount.

diff --git a/sdk/cli/bin/crunch-job b/sdk/cli/bin/crunch-job
index 9e580d3..ac39340 100755
--- a/sdk/cli/bin/crunch-job
+++ b/sdk/cli/bin/crunch-job
@@ -622,7 +622,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
     $ENV{"TASK_SLOT_NODE"} = $slot[$childslot]->{node}->{name};
     $ENV{"TASK_SLOT_NUMBER"} = $slot[$childslot]->{cpu};
     $ENV{"TASK_WORK"} = $ENV{"JOB_WORK"}."/$id.$$";
-    $ENV{"HOME"} = $ENV{"TASK_WORK"}.".home";
+    $ENV{"HOME"} = $ENV{"TASK_WORK"};
     $ENV{"TASK_KEEPMOUNT"} = $ENV{"TASK_WORK"}.".keep";
     $ENV{"TASK_TMPDIR"} = $ENV{"TASK_WORK"}; # deprecated
     $ENV{"CRUNCH_NODE_SLOTS"} = $slot[$childslot]->{node}->{ncpus};
@@ -639,7 +639,7 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
     my $build_script_to_send = "";
     my $command =
 	"if [ -e $ENV{TASK_WORK} ]; then rm -rf $ENV{TASK_WORK}; fi; "
-        ."mkdir -p $ENV{JOB_WORK} $ENV{CRUNCH_TMP} $ENV{TASK_WORK} $ENV{TASK_KEEPMOUNT} $ENV{HOME}"
+        ."mkdir -p $ENV{JOB_WORK} $ENV{CRUNCH_TMP} $ENV{TASK_WORK} $ENV{TASK_KEEPMOUNT}"
 	."&& cd $ENV{CRUNCH_TMP} ";
     if ($build_script)
     {

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list