Merge branch '18184-singularity-374'

refs #18184

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/lib/crunchrun/executor_test.go b/lib/crunchrun/executor_test.go
index 0f9901d6a1ff0d6ebb268c23b107f5ff5514244b..08c7140add8245a39f029328d43ad1ff64114155 100644 (file)
--- 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 73aecd01e634ed844e1b4298fd2314fba3bb596e..6dd28d6cec4bf8fa2b3674fd3f512ca4f734346e 100644 (file)
--- 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 {