Update tests for removed Docker versions

kubernetes · Apr 6, 2020 · 3851a41 · 3851a41
1 parent 1389510
commit 3851a41
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 20 deletions.
diff --git a/nodeup/pkg/model/docker_test.go b/nodeup/pkg/model/docker_test.go
@@ -168,8 +168,8 @@ func TestDockerBuilder_Simple(t *testing.T) {
 	runDockerBuilderTest(t, "simple")
 }
 
-func TestDockerBuilder_1_12_1(t *testing.T) {
-	runDockerBuilderTest(t, "docker_1.12.1")
+func TestDockerBuilder_18_06_3(t *testing.T) {
+	runDockerBuilderTest(t, "docker_18.06.3")
 }
 
 func TestDockerBuilder_LogFlags(t *testing.T) {

diff --git a/.../dockerbuilder/docker_1.12.1/cluster.yaml → ...dockerbuilder/docker_18.06.3/cluster.yaml b/.../dockerbuilder/docker_1.12.1/cluster.yaml → ...dockerbuilder/docker_18.06.3/cluster.yaml
@@ -9,6 +9,8 @@ spec:
   channel: stable
   cloudProvider: aws
   configBase: memfs://clusters.example.com/minimal.example.com
+  docker:
+    version: 18.06.3
   etcdClusters:
   - etcdMembers:
     - instanceGroup: master-us-test-1a
@@ -35,5 +37,3 @@ spec:
     name: us-test-1a
     type: Public
     zone: us-test-1a
-  docker:
-    version: 1.12.1
diff --git a/...ts/dockerbuilder/docker_1.12.1/tasks.yaml → ...s/dockerbuilder/docker_18.06.3/tasks.yaml b/...ts/dockerbuilder/docker_1.12.1/tasks.yaml → ...s/dockerbuilder/docker_18.06.3/tasks.yaml
@@ -268,11 +268,11 @@ contents: |2
 path: /usr/share/doc/docker/apache.txt
 type: file
 ---
-Name: docker-engine
-hash: 30f7840704361673db2b62f25b6038628184b056
+Name: docker-ce
+hash: c06eda4e934cce6a7941a6af6602d4315b500a22
 preventStart: true
-source: http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.12.1-0~xenial_amd64.deb
-version: 1.12.1-0~xenial
+source: https://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_18.06.3~ce~3-0~ubuntu_amd64.deb
+version: 18.06.3~ce~3-0~ubuntu
 ---
 Name: docker-healthcheck.service
 definition: |

diff --git a/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/healthcheck/cluster.yaml
@@ -11,6 +11,7 @@ spec:
   configBase: memfs://clusters.example.com/minimal.example.com
   docker:
     healthCheck: true
+    version: 17.03.2
   etcdClusters:
   - etcdMembers:
     - instanceGroup: master-us-test-1a

diff --git a/nodeup/pkg/model/tests/dockerbuilder/healthcheck/tasks.yaml b/nodeup/pkg/model/tests/dockerbuilder/healthcheck/tasks.yaml
@@ -1,3 +1,6 @@
+file: /usr/bin/docker-runc
+mode: +i
+---
 contents: |-
   DOCKER_OPTS=
   DOCKER_NOFILE=1000000
@@ -268,11 +271,11 @@ contents: |2
 path: /usr/share/doc/docker/apache.txt
 type: file
 ---
-Name: docker-engine
-hash: b758fc88346a1e5eebf7408b0d0c99f4f134166c
+Name: docker-ce
+hash: 4dcee1a05ec592e8a76e53e5b464ea43085a2849
 preventStart: true
-source: http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.12.3-0~xenial_amd64.deb
-version: 1.12.3-0~xenial
+source: http://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_17.03.2~ce-0~ubuntu-xenial_amd64.deb
+version: 17.03.2~ce-0~ubuntu-xenial
 ---
 Name: docker-healthcheck.service
 definition: |

diff --git a/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/logflags/cluster.yaml
@@ -9,6 +9,8 @@ spec:
   channel: stable
   cloudProvider: aws
   configBase: memfs://logflags.example.com/minimal.example.com
+  docker:
+    version: 17.03.2
   etcdClusters:
   - etcdMembers:
     - instanceGroup: master-us-test-1a

diff --git a/nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml b/nodeup/pkg/model/tests/dockerbuilder/logflags/tasks.yaml
@@ -1,3 +1,6 @@
+file: /usr/bin/docker-runc
+mode: +i
+---
 contents: |-
   DOCKER_OPTS=
   DOCKER_NOFILE=1000000
@@ -268,11 +271,11 @@ contents: |2
 path: /usr/share/doc/docker/apache.txt
 type: file
 ---
-Name: docker-engine
-hash: b758fc88346a1e5eebf7408b0d0c99f4f134166c
+Name: docker-ce
+hash: 4dcee1a05ec592e8a76e53e5b464ea43085a2849
 preventStart: true
-source: http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.12.3-0~xenial_amd64.deb
-version: 1.12.3-0~xenial
+source: http://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_17.03.2~ce-0~ubuntu-xenial_amd64.deb
+version: 17.03.2~ce-0~ubuntu-xenial
 ---
 Name: docker-healthcheck.service
 definition: |

diff --git a/nodeup/pkg/model/tests/dockerbuilder/simple/cluster.yaml b/nodeup/pkg/model/tests/dockerbuilder/simple/cluster.yaml
@@ -9,6 +9,8 @@ spec:
   channel: stable
   cloudProvider: aws
   configBase: memfs://clusters.example.com/minimal.example.com
+  docker:
+    version: 17.03.2
   etcdClusters:
   - etcdMembers:
     - instanceGroup: master-us-test-1a

diff --git a/nodeup/pkg/model/tests/dockerbuilder/simple/tasks.yaml b/nodeup/pkg/model/tests/dockerbuilder/simple/tasks.yaml
@@ -1,3 +1,6 @@
+file: /usr/bin/docker-runc
+mode: +i
+---
 contents: |-
   DOCKER_OPTS=
   DOCKER_NOFILE=1000000
@@ -268,11 +271,11 @@ contents: |2
 path: /usr/share/doc/docker/apache.txt
 type: file
 ---
-Name: docker-engine
-hash: b758fc88346a1e5eebf7408b0d0c99f4f134166c
+Name: docker-ce
+hash: 4dcee1a05ec592e8a76e53e5b464ea43085a2849
 preventStart: true
-source: http://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_1.12.3-0~xenial_amd64.deb
-version: 1.12.3-0~xenial
+source: http://download.docker.com/linux/ubuntu/dists/xenial/pool/stable/amd64/docker-ce_17.03.2~ce-0~ubuntu-xenial_amd64.deb
+version: 17.03.2~ce-0~ubuntu-xenial
 ---
 Name: docker-healthcheck.service
 definition: |