[ARVADOS] updated: 2.1.0-2459-g554dc3c84

[Git user]

Summary of changes:
 lib/crunchrun/singularity.go      | 6 +++---
 lib/crunchrun/singularity_test.go | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

       via  554dc3c84338223df363a05a215919f7af90fc6a (commit)
       via  7285b2204d2650179782981dea2af454e607fd7f (commit)
      from  f5b6bae39a2afec70fd3d232d0a9da5c5b9a3135 (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 554dc3c84338223df363a05a215919f7af90fc6a
Author: Tom Clegg <tom at curii.com>
Date:   Mon May 16 14:24:02 2022 -0400

    19099: Skip IPAddress test if it looks like we can't use --fakeroot.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/singularity_test.go b/lib/crunchrun/singularity_test.go
index 2bad082ba..7e5819bb4 100644
--- a/lib/crunchrun/singularity_test.go
+++ b/lib/crunchrun/singularity_test.go
@@ -5,9 +5,11 @@
 package crunchrun
 
 import (
+	"os"
 	"os/exec"
 
 	. "gopkg.in/check.v1"
+	check "gopkg.in/check.v1"
 )
 
 var _ = Suite(&singularitySuite{})
@@ -39,6 +41,11 @@ func (s *singularitySuite) TestIPAddress(c *C) {
 	// because uid=0 under arvados-dispatch-cloud. But in test
 	// cases, uid!=0, which means --network=bridge is conditional
 	// on --fakeroot.
+	uuc, err := os.ReadFile("/proc/sys/kernel/unprivileged_userns_clone")
+	c.Check(err, check.IsNil)
+	if string(uuc) == "0\n" {
+		c.Skip("insufficient privileges to run this test case -- `singularity exec --fakeroot` requires /proc/sys/kernel/unprivileged_userns_clone = 1")
+	}
 	s.executor.(*singularityExecutor).fakeroot = true
 	s.executorSuite.TestIPAddress(c)
 }

commit 7285b2204d2650179782981dea2af454e607fd7f
Author: Tom Clegg <tom at curii.com>
Date:   Sun May 15 23:44:40 2022 -0400

    19099: Fix typos.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/singularity.go b/lib/crunchrun/singularity.go
index f154728c7..2d8962e96 100644
--- a/lib/crunchrun/singularity.go
+++ b/lib/crunchrun/singularity.go
@@ -281,7 +281,7 @@ func (e *singularityExecutor) execCmd(path string) *exec.Cmd {
 	for _, path := range binds {
 		mount := e.spec.BindMounts[path]
 		if path == e.spec.Env["HOME"] {
-			// Singularity treates $HOME as special case
+			// Singularity treats $HOME as special case
 			args = append(args, "--home", mount.HostPath+":"+path)
 		} else {
 			args = append(args, "--bind", mount.HostPath+":"+path+":"+readonlyflag[mount.ReadOnly])
@@ -295,8 +295,8 @@ func (e *singularityExecutor) execCmd(path string) *exec.Cmd {
 	env := make([]string, 0, len(e.spec.Env))
 	for k, v := range e.spec.Env {
 		if k == "HOME" {
-			// Singularity treates $HOME as special case, this is handled
-			// with --home above
+			// Singularity treats $HOME as special case,
+			// this is handled with --home above
 			continue
 		}
 		env = append(env, "SINGULARITYENV_"+k+"="+v)

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


hooks/post-receive
--