From f15c4fd16020d1fe48cff5aca240507b1d040bfa Mon Sep 17 00:00:00 2001 From: Nishant Totla Date: Thu, 8 Jun 2017 15:20:09 -0700 Subject: [PATCH] Fixing stack deploy tests to not contact registry Because of cherry-pick from commit f790e839fc7d669acafa6365ca7a83cbedfe9e2d Signed-off-by: Nishant Totla --- .../engine/hack/integration-cli-on-swarm/host/dockercmd.go | 1 + components/engine/integration-cli/docker_cli_stack_test.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/components/engine/hack/integration-cli-on-swarm/host/dockercmd.go b/components/engine/hack/integration-cli-on-swarm/host/dockercmd.go index 10ea0ecc24..c539876213 100644 --- a/components/engine/hack/integration-cli-on-swarm/host/dockercmd.go +++ b/components/engine/hack/integration-cli-on-swarm/host/dockercmd.go @@ -37,6 +37,7 @@ func deployStack(unusedCli *client.Client, stackName, composeFilePath string) er {"docker", "stack", "deploy", "--compose-file", composeFilePath, "--with-registry-auth", + "--resolve-image", "never", stackName}, }) } diff --git a/components/engine/integration-cli/docker_cli_stack_test.go b/components/engine/integration-cli/docker_cli_stack_test.go index 91fe4d75c0..51b98ff187 100644 --- a/components/engine/integration-cli/docker_cli_stack_test.go +++ b/components/engine/integration-cli/docker_cli_stack_test.go @@ -62,6 +62,7 @@ func (s *DockerSwarmSuite) TestStackDeployComposeFile(c *check.C) { testStackName := "testdeploy" stackArgs := []string{ "stack", "deploy", + "--resolve-image", "never", "--compose-file", "fixtures/deploy/default.yaml", testStackName, } @@ -88,6 +89,7 @@ func (s *DockerSwarmSuite) TestStackDeployWithSecretsTwice(c *check.C) { testStackName := "testdeploy" stackArgs := []string{ "stack", "deploy", + "--resolve-image", "never", "--compose-file", "fixtures/deploy/secrets.yaml", testStackName, } @@ -120,6 +122,7 @@ func (s *DockerSwarmSuite) TestStackRemove(c *check.C) { stackName := "testdeploy" stackArgs := []string{ "stack", "deploy", + "--resolve-image", "never", "--compose-file", "fixtures/deploy/remove.yaml", stackName, } @@ -179,6 +182,7 @@ func (s *DockerSwarmSuite) TestStackDeployWithDAB(c *check.C) { // deploy stackArgs := []string{ "stack", "deploy", + "--resolve-image", "never", "--bundle-file", testDABFileName, testStackName, }