[arvados] updated: 2.1.0-2545-g6caeb0768

[git repository hosting]

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

       via  6caeb0768adabd32b50cc2ca6eb49d162745c4b0 (commit)
      from  36cfafd6e7eae2784c22aefdd9df26783412d42a (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 6caeb0768adabd32b50cc2ca6eb49d162745c4b0
Author: Tom Clegg <tom at curii.com>
Date:   Fri May 20 20:56:47 2022 -0400

    15370: Temporarily disable some docker tests.
    
    See https://dev.arvados.org/issues/15370#note-31
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/cmd/arvados-package/build_test.go b/cmd/arvados-package/build_test.go
index 75e8f7604..0f6288360 100644
--- a/cmd/arvados-package/build_test.go
+++ b/cmd/arvados-package/build_test.go
@@ -29,7 +29,10 @@ func (s *BuildSuite) TestBuildAndInstall(c *check.C) {
 		c.Skip("skipping docker tests in short mode")
 	} else if _, err := exec.Command("docker", "info").CombinedOutput(); err != nil {
 		c.Skip("skipping docker tests because docker is not available")
+	} else if os.Getenv("ENABLE_DOCKER_TESTS") == "" {
+		c.Skip("docker tests temporarily disabled if ENABLE_DOCKER_TESTS is not set, see https://dev.arvados.org/issues/15370#note-31")
 	}
+
 	tmpdir := c.MkDir()
 	defer os.RemoveAll(tmpdir)
 	err := os.Chmod(tmpdir, 0755)
diff --git a/lib/crunchrun/integration_test.go b/lib/crunchrun/integration_test.go
index ec0893728..2ba7556cb 100644
--- a/lib/crunchrun/integration_test.go
+++ b/lib/crunchrun/integration_test.go
@@ -249,6 +249,9 @@ func (s *integrationSuite) testRunTrivialContainer(c *C) {
 	if err := exec.Command("which", s.engine).Run(); err != nil {
 		c.Skip(fmt.Sprintf("%s: %s", s.engine, err))
 	}
+	if s.engine == "docker" && os.Getenv("ENABLE_DOCKER_TESTS") == "" {
+		c.Skip("docker tests temporarily disabled if ENABLE_DOCKER_TESTS is not set, see https://dev.arvados.org/issues/15370#note-31")
+	}
 	s.cr.Command = []string{"sh", "-c", "cat /mnt/in/inputfile >/mnt/out/inputfile && cat /mnt/json >/mnt/out/json && ! touch /mnt/in/shouldbereadonly && mkdir /mnt/out/emptydir"}
 	s.setup(c)
 

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


hooks/post-receive
--