[ARVADOS] created: 2.1.0-1062-gd08083912

[Git user]

        at  d08083912c64b429e4ec06b9a42edd001c1e52a6 (commit)


commit d08083912c64b429e4ec06b9a42edd001c1e52a6
Author: Tom Clegg <tom at curii.com>
Date:   Fri Jul 16 10:44:57 2021 -0400

    17816: Add test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/executor_test.go b/lib/crunchrun/executor_test.go
index 4b6a4b1b2..5934c57b6 100644
--- a/lib/crunchrun/executor_test.go
+++ b/lib/crunchrun/executor_test.go
@@ -141,6 +141,13 @@ func (s *executorSuite) TestExecEnableNetwork(c *C) {
 	}
 }
 
+func (s *executorSuite) TestExecWorkingDir(c *C) {
+	s.spec.WorkingDir = "/tmp"
+	s.spec.Command = []string{"sh", "-c", "pwd"}
+	s.checkRun(c, 0)
+	c.Check(s.stdout.String(), Equals, "/tmp\n")
+}
+
 func (s *executorSuite) TestExecStdoutStderr(c *C) {
 	s.spec.Command = []string{"sh", "-c", "echo foo; echo -n bar >&2; echo baz; echo waz >&2"}
 	s.checkRun(c, 0)

commit ec5fd6d8072cc038648b254a5500868dfdf6a17b
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Thu Jul 15 13:50:22 2021 -0400

    17816: Set the current working directory in the singularity container
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/lib/crunchrun/singularity.go b/lib/crunchrun/singularity.go
index 4bec8c3eb..2a294cf03 100644
--- a/lib/crunchrun/singularity.go
+++ b/lib/crunchrun/singularity.go
@@ -74,7 +74,7 @@ func (e *singularityExecutor) Create(spec containerSpec) error {
 }
 
 func (e *singularityExecutor) Start() error {
-	args := []string{"singularity", "exec", "--containall", "--no-home", "--cleanenv"}
+	args := []string{"singularity", "exec", "--containall", "--no-home", "--cleanenv", "--pwd", e.spec.WorkingDir}
 	if !e.spec.EnableNetwork {
 		args = append(args, "--net", "--network=none")
 	}

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


hooks/post-receive
--