From 73d5f534654ad20729fca1b09d89b3f971446fc8 Mon Sep 17 00:00:00 2001
From: Lantao Liu <lantaol@google.com>
Date: Sat, 2 Sep 2017 00:51:48 +0000
Subject: [PATCH] Update sys spec to support docker 1.11-1.13 and overlay2.

---
 test/e2e_node/system/docker_validator_test.go | 24 +++++++++++--------
 test/e2e_node/system/types.go                 |  5 ++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/test/e2e_node/system/docker_validator_test.go b/test/e2e_node/system/docker_validator_test.go
index 5902323d6ff..7d92b0e75d2 100644
--- a/test/e2e_node/system/docker_validator_test.go
+++ b/test/e2e_node/system/docker_validator_test.go
@@ -28,7 +28,7 @@ func TestValidateDockerInfo(t *testing.T) {
 		Reporter: DefaultReporter,
 	}
 	spec := &DockerSpec{
-		Version:     []string{`1\.(9|1[0-2])\..*`}, // Requires 1.9+
+		Version:     []string{`1\.1[1-3]\..*`}, // Requires 1.11+
 		GraphDriver: []string{"driver_1", "driver_2"},
 	}
 	for _, test := range []struct {
@@ -38,24 +38,28 @@ func TestValidateDockerInfo(t *testing.T) {
 	}{
 		{
 			info: types.Info{Driver: "driver_1", ServerVersion: "1.10.1"},
+			err:  true,
+			warn: false,
+		},
+		{
+			info: types.Info{Driver: "bad_driver", ServerVersion: "1.11.1"},
+			err:  true,
+			warn: false,
+		},
+		{
+			info: types.Info{Driver: "driver_1", ServerVersion: "1.11.1"},
 			err:  false,
 			warn: false,
 		},
 		{
-			info: types.Info{Driver: "bad_driver", ServerVersion: "1.9.1"},
-			err:  true,
+			info: types.Info{Driver: "driver_2", ServerVersion: "1.12.1"},
+			err:  false,
 			warn: false,
 		},
-		{
-			info: types.Info{Driver: "driver_2", ServerVersion: "1.8.1"},
-			err:  true,
-			warn: false,
-		},
-		// TODO remove/change warn value  once sig-node supports 1.13
 		{
 			info: types.Info{Driver: "driver_2", ServerVersion: "1.13.1"},
 			err:  false,
-			warn: true,
+			warn: false,
 		},
 		// TODO remove/change warn value once sig-node supports 17.03-0-ce
 		{
diff --git a/test/e2e_node/system/types.go b/test/e2e_node/system/types.go
index 07c15f04517..49b5249d535 100644
--- a/test/e2e_node/system/types.go
+++ b/test/e2e_node/system/types.go
@@ -159,9 +159,8 @@ var DefaultSysSpec = SysSpec{
 	Cgroups: []string{"cpu", "cpuacct", "cpuset", "devices", "freezer", "memory"},
 	RuntimeSpec: RuntimeSpec{
 		DockerSpec: &DockerSpec{
-			Version: []string{`1\.(9|1[0-2])\..*`}, // Requires 1.9+
-			// TODO(random-liu): Validate overlay2.
-			GraphDriver: []string{"aufs", "overlay", "devicemapper"},
+			Version:     []string{`1\.1[1-3]\..*`}, // Requires 1.11+
+			GraphDriver: []string{"aufs", "overlay", "overlay2", "devicemapper"},
 		},
 	},
 }