[ARVADOS] updated: 2.1.0-2534-g469ea1875

[Git user]

Summary of changes:
 build/run-tests.sh                               |   8 +-
 cmd/arvados-client/container_gateway_test.go     |  15 +--
 lib/controller/localdb/container_gateway_test.go |  11 +-
 lib/crunchrun/container_gateway.go               |  98 +++++++---------
 lib/crunchrun/crunchrun.go                       |  13 +--
 lib/crunchrun/crunchrun_test.go                  |   4 +
 lib/crunchrun/docker.go                          |  34 ++++++
 lib/crunchrun/executor.go                        |   2 +
 lib/crunchrun/executor_test.go                   |  87 ++++++++++++++
 lib/crunchrun/singularity.go                     | 143 ++++++++++++++++++++++-
 lib/crunchrun/singularity_test.go                |  32 ++++-
 lib/install/deps.go                              |   8 ++
 12 files changed, 369 insertions(+), 86 deletions(-)

       via  469ea187586ea8017e26874c2d80414ce7571fae (commit)
       via  aabea703ee77ca91da710dd9bce9716e5d35d7b2 (commit)
       via  c78c7272f9ab77297fbb4e521ab09fe9560754fe (commit)
       via  554dc3c84338223df363a05a215919f7af90fc6a (commit)
       via  7285b2204d2650179782981dea2af454e607fd7f (commit)
       via  f5b6bae39a2afec70fd3d232d0a9da5c5b9a3135 (commit)
       via  503860c347e620432ee501c1edc245fca94bf729 (commit)
       via  8c52491b9feedc523f5aa30721a5a496ebfe7ea6 (commit)
       via  5331fde2afc6224b10e828ad09f3ffe05f7f4e5e (commit)
       via  3ad49eb34f3c7c30588af3cab6a3c9a593dcd5ad (commit)
       via  e30b7ec3040cac89a2e134fddf8cb47c1905ea82 (commit)
       via  2a21ea7ddc0739f9ce54589600be7f136ddd83fa (commit)
       via  43fdb06a1620d926bdaec00582c82a4190805d86 (commit)
       via  7ebe828a435dcaa1b5668b72adbaad495059f211 (commit)
      from  fd178c88e1f61ca4e809073ee5baafa26986eb59 (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 469ea187586ea8017e26874c2d80414ce7571fae
Merge: fd178c88e aabea703e
Author: Tom Clegg <tom at curii.com>
Date:   Thu May 19 11:26:59 2022 -0400

    Merge branch '19099-singularity-container-shell'
    
    closes #19099
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --cc lib/crunchrun/executor.go
index 0a65f4d63,b5b788433..1ed460acd
--- a/lib/crunchrun/executor.go
+++ b/lib/crunchrun/executor.go
@@@ -60,6 -60,8 +60,8 @@@ type containerExecutor interface 
  	// Release resources (temp dirs, stopped containers)
  	Close()
  
 -	// Name of runtime engine ("docker", "singularity")
 +	// Name and version of runtime engine ("docker 20.10.16", "singularity-ce version 3.9.9")
  	Runtime() string
+ 
+ 	GatewayTarget
  }
diff --cc lib/crunchrun/singularity.go
index 1af0d420e,2d8962e96..1da401f85
--- a/lib/crunchrun/singularity.go
+++ b/lib/crunchrun/singularity.go
@@@ -5,12 -5,17 +5,18 @@@
  package crunchrun
  
  import (
+ 	"bytes"
+ 	"errors"
  	"fmt"
  	"io/ioutil"
+ 	"net"
  	"os"
  	"os/exec"
+ 	"os/user"
+ 	"regexp"
  	"sort"
+ 	"strconv"
 +	"strings"
  	"syscall"
  	"time"
  
diff --cc lib/crunchrun/singularity_test.go
index bad2abef3,7e5819bb4..e4c7cdb30
--- a/lib/crunchrun/singularity_test.go
+++ b/lib/crunchrun/singularity_test.go
@@@ -47,6 -77,6 +77,6 @@@ func (s *singularityStubSuite) TestSing
  	c.Check(err, IsNil)
  	e.imageFilename = "/fake/image.sif"
  	cmd := e.execCmd("./singularity")
- 	c.Check(cmd.Args, DeepEquals, []string{"./singularity", "exec", "--containall", "--cleanenv", "--pwd", "/WorkingDir", "--net", "--network=none", "--nv", "--bind", "/hostpath:/mnt:ro", "/fake/image.sif"})
+ 	c.Check(cmd.Args, DeepEquals, []string{"./singularity", "exec", "--containall", "--cleanenv", "--pwd=/WorkingDir", "--net", "--network=none", "--nv", "--bind", "/hostpath:/mnt:ro", "/fake/image.sif"})
 -	c.Check(cmd.Env, DeepEquals, []string{"SINGULARITYENV_FOO=bar"})
 +	c.Check(cmd.Env, DeepEquals, []string{"SINGULARITYENV_FOO=bar", "SINGULARITY_NO_EVAL=1"})
  }

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


hooks/post-receive
--