[ARVADOS] created: 2.1.0-1399-gd3841f686

[Git user]

        at  d3841f6869a8c6ae667df0288a5c88da6d830a6e (commit)


commit d3841f6869a8c6ae667df0288a5c88da6d830a6e
Author: Tom Clegg <tom at curii.com>
Date:   Thu Sep 23 16:53:20 2021 -0400

    18184: Install singularity 3.7.4 for dev/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 0f9901d6a..08c7140ad 100644
--- a/lib/crunchrun/executor_test.go
+++ b/lib/crunchrun/executor_test.go
@@ -120,8 +120,10 @@ func (s *executorSuite) TestExecCleanEnv(c *C) {
 			// docker sets these by itself
 		case "LD_LIBRARY_PATH", "SINGULARITY_NAME", "PWD", "LANG", "SHLVL", "SINGULARITY_INIT", "SINGULARITY_CONTAINER":
 			// singularity sets these by itself (cf. https://sylabs.io/guides/3.5/user-guide/environment_and_metadata.html)
-		case "PROMPT_COMMAND", "PS1", "SINGULARITY_APPNAME":
-			// singularity also sets these by itself (as of v3.5.2)
+		case "SINGULARITY_APPNAME":
+			// singularity also sets this by itself (v3.5.2, but not v3.7.4)
+		case "PROMPT_COMMAND", "PS1", "SINGULARITY_BIND", "SINGULARITY_COMMAND", "SINGULARITY_ENVIRONMENT":
+			// singularity also sets these by itself (v3.7.4)
 		default:
 			got[kv[0]] = kv[1]
 		}
diff --git a/lib/install/deps.go b/lib/install/deps.go
index 73aecd01e..6dd28d6ce 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -322,7 +322,7 @@ rm ${zip}
 			}
 		}
 
-		singularityversion := "3.5.2"
+		singularityversion := "3.7.4"
 		if havesingularityversion, err := exec.Command("/var/lib/arvados/bin/singularity", "--version").CombinedOutput(); err == nil && strings.Contains(string(havesingularityversion), singularityversion) {
 			logger.Print("singularity " + singularityversion + " already installed")
 		} else if dev || test {

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


hooks/post-receive
--