X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4085665f87c82939961e55bf004ca47c03ca30ac..40e378c88c2ae8e90b0785f3983ca320827e4cdf:/cmd/arvados-package/build_test.go

diff --git a/cmd/arvados-package/build_test.go b/cmd/arvados-package/build_test.go
index 9f002b5353..0f6288360c 100644
--- a/cmd/arvados-package/build_test.go
+++ b/cmd/arvados-package/build_test.go
@@ -29,9 +29,14 @@ 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)
+	c.Assert(err, check.IsNil)
 
 	cmd := exec.Command("go", "run", ".",
 		"build",
@@ -41,16 +46,20 @@ func (s *BuildSuite) TestBuildAndInstall(c *check.C) {
 	)
 	cmd.Stdout = os.Stderr
 	cmd.Stderr = os.Stderr
-	err := cmd.Run()
+	err = cmd.Run()
 	c.Check(err, check.IsNil)
 
 	fi, err := os.Stat(tmpdir + "/arvados-server-easy_1.2.3~rc4_amd64.deb")
 	c.Assert(err, check.IsNil)
 	c.Logf("%#v", fi)
 
+	buf, _ := exec.Command("ls", "-l", tmpdir).CombinedOutput()
+	c.Logf("%s", buf)
+
 	cmd = exec.Command("go", "run", ".",
 		"testinstall",
 		"-package-dir", tmpdir,
+		"-package-version", "1.2.3~rc4",
 	)
 	cmd.Stdout = os.Stderr
 	cmd.Stderr = os.Stderr