Bump version to 19.03.0-dev
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Родитель
00e6843118
Коммит
7fa9b4babf
2
VERSION
2
VERSION
|
@ -1 +1 @@
|
|||
18.09.0-dev
|
||||
19.03.0-dev
|
||||
|
|
|
@ -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.",
|
||||
|
|
|
@ -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.",
|
||||
|
|
Загрузка…
Ссылка в новой задаче