15370: Re-enable docker tests.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --git a/cmd/arvados-package/build_test.go b/cmd/arvados-package/build_test.go
index 0f6288360c02b8934a8dddb491d17aa9edf69c80..7130e3394b0a3bdeb1e635821ea745587dc38528 100644 (file)
--- 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 96ba576a491a8692b5dc7b89fb268fe5c9402e46..ce92a9b8075c083ebfc13d0748c88b890ad7052d 100644 (file)
--- 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)