15370: Merge branch 'main' into 15370-loopback-dispatchcloud

[arvados.git] / cmd / arvados-package / build_test.go

diff --git a/cmd/arvados-package/build_test.go b/cmd/arvados-package/build_test.go
index b4ad68b1df0455d833b8a6ca9782314989471d43..0f6288360c02b8934a8dddb491d17aa9edf69c80 100644 (file)
--- 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)
@@ -56,6 +59,7 @@ func (s *BuildSuite) TestBuildAndInstall(c *check.C) {
        cmd = exec.Command("go", "run", ".",
                "testinstall",
                "-package-dir", tmpdir,
+               "-package-version", "1.2.3~rc4",
        )
        cmd.Stdout = os.Stderr
        cmd.Stderr = os.Stderr