From 13f6d45704efc68ca8419e8917376aa44fdee1be Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 30 May 2022 09:56:23 -0400 Subject: [PATCH 1/1] 15370: Re-enable docker tests. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- cmd/arvados-package/build_test.go | 2 -- lib/crunchrun/integration_test.go | 3 --- 2 files changed, 5 deletions(-) diff --git a/cmd/arvados-package/build_test.go b/cmd/arvados-package/build_test.go index 0f6288360c..7130e3394b 100644 --- a/cmd/arvados-package/build_test.go +++ b/cmd/arvados-package/build_test.go @@ -29,8 +29,6 @@ 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() diff --git a/lib/crunchrun/integration_test.go b/lib/crunchrun/integration_test.go index 96ba576a49..ce92a9b807 100644 --- a/lib/crunchrun/integration_test.go +++ b/lib/crunchrun/integration_test.go @@ -249,9 +249,6 @@ 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) -- 2.30.2