From 7fa9b4babf831d6134545cb8ba3a4505e1e239c5 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 27 Aug 2018 11:47:27 +0200 Subject: [PATCH] Bump version to 19.03.0-dev Signed-off-by: Sebastiaan van Stijn --- VERSION | 2 +- e2eengine/altroot/altroot_test.go | 7 ++++--- e2eengine/multi/multi_test.go | 9 +++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/VERSION b/VERSION index 943e439152..8ff4639f4e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -18.09.0-dev +19.03.0-dev diff --git a/e2eengine/altroot/altroot_test.go b/e2eengine/altroot/altroot_test.go index 23daaa9700..0ea803e284 100644 --- a/e2eengine/altroot/altroot_test.go +++ b/e2eengine/altroot/altroot_test.go @@ -1,7 +1,6 @@ package check import ( - "os" "testing" "github.com/docker/cli/e2eengine" @@ -17,9 +16,12 @@ func TestDockerEngineOnContainerdAltRootConfig(t *testing.T) { } }() + // Use a fixed version to prevent failures when development of the next version starts, and no image is available yet. + targetVersion := "18.09.0-dev" + t.Log("First engine init") // First init - result := icmd.RunCmd(icmd.Command("docker", "engine", "init", "--config-file", "/tmp/etc/docker/daemon.json"), + result := icmd.RunCmd(icmd.Command("docker", "engine", "init", "--config-file", "/tmp/etc/docker/daemon.json", "--version", targetVersion), func(c *icmd.Cmd) { c.Env = append(c.Env, "DOCKER_CLI_EXPERIMENTAL=enabled") }) @@ -32,7 +34,6 @@ func TestDockerEngineOnContainerdAltRootConfig(t *testing.T) { // Make sure update doesn't blow up with alternate config path t.Log("perform update") // Now update and succeed - targetVersion := os.Getenv("VERSION") result = icmd.RunCmd(icmd.Command("docker", "engine", "update", "--version", targetVersion)) result.Assert(t, icmd.Expected{ Out: "Success! The docker engine is now running.", diff --git a/e2eengine/multi/multi_test.go b/e2eengine/multi/multi_test.go index f86d768cae..b7994c8019 100644 --- a/e2eengine/multi/multi_test.go +++ b/e2eengine/multi/multi_test.go @@ -1,7 +1,6 @@ package multi import ( - "os" "testing" "github.com/docker/cli/e2eengine" @@ -17,9 +16,12 @@ func TestDockerEngineOnContainerdMultiTest(t *testing.T) { } }() + // Use a fixed version to prevent failures when development of the next version starts, and no image is available yet. + targetVersion := "18.09.0-dev" + t.Log("Attempt engine init without experimental") // First init - result := icmd.RunCmd(icmd.Command("docker", "engine", "init"), + result := icmd.RunCmd(icmd.Command("docker", "engine", "init", "--version", targetVersion), func(c *icmd.Cmd) { c.Env = append(c.Env, "DOCKER_CLI_EXPERIMENTAL=disabled") }) @@ -31,7 +33,7 @@ func TestDockerEngineOnContainerdMultiTest(t *testing.T) { t.Log("First engine init") // First init - result = icmd.RunCmd(icmd.Command("docker", "engine", "init"), + result = icmd.RunCmd(icmd.Command("docker", "engine", "init", "--version", targetVersion), func(c *icmd.Cmd) { c.Env = append(c.Env, "DOCKER_CLI_EXPERIMENTAL=enabled") }) @@ -64,7 +66,6 @@ func TestDockerEngineOnContainerdMultiTest(t *testing.T) { t.Log("perform update") // Now update and succeed - targetVersion := os.Getenv("VERSION") result = icmd.RunCmd(icmd.Command("docker", "engine", "update", "--version", targetVersion)) result.Assert(t, icmd.Expected{ Out: "Success! The docker engine is now running.",