[arvados] updated: 2.7.0-6236-g8836fd8f35

[git repository hosting]

Summary of changes:
 lib/install/deps.go          | 4 ++++
 services/keep-web/s3_test.go | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

       via  8836fd8f35b497eaad22de9d9478d8aa97fb359c (commit)
      from  19d0d9c46a423adf81410f582b3a60a412d3e7f8 (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 8836fd8f35b497eaad22de9d9478d8aa97fb359c
Author: Tom Clegg <tom at curii.com>
Date:   Thu Mar 21 11:21:22 2024 -0400

    Update test failing on debian 12 if s3cmd is installed.
    
    Also, update `arvados-server install -type test` to install s3cmd if
    available.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/install/deps.go b/lib/install/deps.go
index f9795cf872..08312d738c 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -235,6 +235,10 @@ func (inst *installCommand) RunCommand(prog string, args []string, stdin io.Read
 			} else {
 				pkgs = append(pkgs, "firefox")
 			}
+			if osv.Debian && osv.Major >= 11 {
+				// not available in Debian <11
+				pkgs = append(pkgs, "s3cmd")
+			}
 		}
 		if dev || test {
 			pkgs = append(pkgs,
diff --git a/services/keep-web/s3_test.go b/services/keep-web/s3_test.go
index 0e821696b7..79b3712c6b 100644
--- a/services/keep-web/s3_test.go
+++ b/services/keep-web/s3_test.go
@@ -1295,7 +1295,11 @@ func (s *IntegrationSuite) TestS3cmd(c *check.C) {
 	cmd = exec.Command("s3cmd", "--no-ssl", "--host="+s.testServer.URL[7:], "--host-bucket="+s.testServer.URL[7:], "--access_key="+arvadostest.ActiveTokenUUID, "--secret_key="+arvadostest.ActiveToken, "get", "s3://"+arvadostest.FooCollection+"/foo,;$[|]bar", tmpfile)
 	buf, err = cmd.CombinedOutput()
 	c.Check(err, check.NotNil)
-	c.Check(string(buf), check.Matches, `(?ms).*NoSuchKey.*\n`)
+	// As of commit b7520e5c25e1bf25c1a8bf5aa2eadb299be8f606
+	// (between debian bullseye and bookworm versions), s3cmd
+	// started catching the NoSuchKey error code and replacing it
+	// with "Source object '%s' does not exist.".
+	c.Check(string(buf), check.Matches, `(?ms).*(NoSuchKey|Source object.*does not exist).*\n`)
 }
 
 func (s *IntegrationSuite) TestS3BucketInHost(c *check.C) {

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


hooks/post-receive
--