[arvados] updated: 2.1.0-2560-gbb159bac9

[git repository hosting]

Summary of changes:
 cmd/arvados-package/build.go      | 2 +-
 cmd/arvados-package/install.go    | 2 +-
 lib/crunchrun/integration_test.go | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

       via  bb159bac9bfe568eccbc61ba0b8c04752a1e8531 (commit)
       via  2e74236fa27822addd856f194befc28382990ce0 (commit)
      from  13f6d45704efc68ca8419e8917376aa44fdee1be (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 bb159bac9bfe568eccbc61ba0b8c04752a1e8531
Author: Tom Clegg <tom at curii.com>
Date:   Mon May 30 14:54:40 2022 -0400

    15370: Fix unspecified docker API version requirement.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/cmd/arvados-package/build.go b/cmd/arvados-package/build.go
index 27531d3bc..68dda8a5e 100644
--- a/cmd/arvados-package/build.go
+++ b/cmd/arvados-package/build.go
@@ -137,7 +137,7 @@ func build(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Wr
 }
 
 func dockerRm(ctx context.Context, name string) error {
-	cli, err := client.NewEnvClient()
+	cli, err := client.NewClient(client.DefaultDockerHost, "1.21", nil, nil)
 	if err != nil {
 		return err
 	}
diff --git a/cmd/arvados-package/install.go b/cmd/arvados-package/install.go
index 6b6113b95..437a1ad21 100644
--- a/cmd/arvados-package/install.go
+++ b/cmd/arvados-package/install.go
@@ -134,7 +134,7 @@ exec arvados-server boot -listen-host=0.0.0.0 -no-workbench2=false $bootargs
 }
 
 func dockerImageExists(ctx context.Context, name string) (bool, error) {
-	cli, err := client.NewEnvClient()
+	cli, err := client.NewClient(client.DefaultDockerHost, "1.21", nil, nil)
 	if err != nil {
 		return false, err
 	}

commit 2e74236fa27822addd856f194befc28382990ce0
Author: Tom Clegg <tom at curii.com>
Date:   Mon May 30 14:54:25 2022 -0400

    15370: Fix flaky test.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/integration_test.go b/lib/crunchrun/integration_test.go
index ce92a9b80..a9a270b07 100644
--- a/lib/crunchrun/integration_test.go
+++ b/lib/crunchrun/integration_test.go
@@ -222,7 +222,7 @@ func (s *integrationSuite) TestRunTrivialContainerWithLocalKeepstore(c *C) {
 	s.SetUpTest(c)
 	s.stdin.Reset()
 	s.testRunTrivialContainer(c)
-	c.Check(s.logFiles["crunch-run.txt"], Matches, `(?ms).*not starting a local keepstore process because a volume \(zzzzz-nyw5e-000000000000000\) uses AccessViaHosts\n.*`)
+	c.Check(s.logFiles["crunch-run.txt"], Matches, `(?ms).*not starting a local keepstore process because a volume \(zzzzz-nyw5e-00000000000000\d\) uses AccessViaHosts\n.*`)
 
 	// Check that config read errors are logged
 	s.SetUpTest(c)

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


hooks/post-receive
--