From 76e2f24bd85796d68e71c6de16197e6aaf8d6d59 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Fri, 18 Aug 2017 10:14:45 +1000 Subject: [PATCH 1/3] Docker 1.10 and 1.11 no longer supported by RancherOS v1.1.0 Signed-off-by: Sven Dowideit --- os-config.tpl.yml | 6 ++-- tests/assets/test_05/cloud-config.yml | 2 +- ...onfig1.11.2.yml => cloud-config1.13.1.yml} | 2 +- tests/assets/test_25/cloud-config.yml | 2 +- tests/custom_docker_test.go | 28 +++++++++---------- tests/upgrade_test.go | 6 ++-- 6 files changed, 23 insertions(+), 23 deletions(-) rename tests/assets/test_12/{cloud-config1.11.2.yml => cloud-config1.13.1.yml} (94%) diff --git a/os-config.tpl.yml b/os-config.tpl.yml index 616ae31d..ddd3d2d9 100644 --- a/os-config.tpl.yml +++ b/os-config.tpl.yml @@ -10,7 +10,7 @@ rancher: engine: docker-17.03.1-ce {{else -}} docker: - engine: docker-1.11.2 + engine: docker-1.12.6 {{end -}} network: dns: @@ -327,7 +327,7 @@ rancher: {{if eq "amd64" .ARCH -}} image: {{.OS_REPO}}/os-docker:17.03.1{{.SUFFIX}} {{else -}} - image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}} + image: {{.OS_REPO}}/os-docker:1.12.6{{.SUFFIX}} {{end -}} command: ros user-docker environment: @@ -369,7 +369,7 @@ rancher: {{if eq "amd64" .ARCH -}} engine: docker-17.03.1-ce {{else -}} - engine: docker-1.11.2 + engine: docker-1.12.6 {{end -}} storage_driver: overlay group: docker diff --git a/tests/assets/test_05/cloud-config.yml b/tests/assets/test_05/cloud-config.yml index 0c492da4..61c7f773 100644 --- a/tests/assets/test_05/cloud-config.yml +++ b/tests/assets/test_05/cloud-config.yml @@ -1,6 +1,6 @@ #cloud-config rancher: docker: - engine: docker-1.10.3 + engine: docker-1.12.6 ssh_authorized_keys: - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF diff --git a/tests/assets/test_12/cloud-config1.11.2.yml b/tests/assets/test_12/cloud-config1.13.1.yml similarity index 94% rename from tests/assets/test_12/cloud-config1.11.2.yml rename to tests/assets/test_12/cloud-config1.13.1.yml index 1654bc77..b6d771b5 100644 --- a/tests/assets/test_12/cloud-config1.11.2.yml +++ b/tests/assets/test_12/cloud-config1.13.1.yml @@ -3,4 +3,4 @@ ssh_authorized_keys: - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF rancher: docker: - engine: docker-1.11.2 + engine: docker-1.13.1 diff --git a/tests/assets/test_25/cloud-config.yml b/tests/assets/test_25/cloud-config.yml index fd993327..8ed3a96e 100644 --- a/tests/assets/test_25/cloud-config.yml +++ b/tests/assets/test_25/cloud-config.yml @@ -2,6 +2,6 @@ rancher: console: debian docker: - engine: docker-1.10.3 + engine: docker-17.06.0-ce ssh_authorized_keys: - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF diff --git a/tests/custom_docker_test.go b/tests/custom_docker_test.go index 9cfdb6c1..5751a67f 100644 --- a/tests/custom_docker_test.go +++ b/tests/custom_docker_test.go @@ -8,9 +8,9 @@ func (s *QemuSuite) TestCustomDocker(c *C) { s.CheckCall(c, ` set -ex -docker version | grep 1.10.3 +docker version | grep 1.12.6 -sudo ros engine list | grep 1.10.3 | grep current +sudo ros engine list | grep 1.12.6 | grep current (sudo ros engine switch invalid 2>&1 || true) | grep "invalid is not a valid engine" (sudo ros engine enable invalid 2>&1 || true) | grep "invalid is not a valid engine" @@ -20,10 +20,10 @@ docker ps | grep nginx`) s.CheckCall(c, ` set -ex -sudo ros engine switch docker-1.11.2 +sudo ros engine switch docker-1.13.1 /usr/sbin/wait-for-docker -docker version | grep 1.11.2 -sudo ros engine list | grep 1.11.2 | grep current +docker version | grep 1.13.1 +sudo ros engine list | grep 1.13.1 | grep current docker ps | grep nginx`) s.Reboot(c) @@ -31,8 +31,8 @@ docker ps | grep nginx`) s.CheckCall(c, ` set -ex -docker version | grep 1.11.2 -sudo ros engine list | grep 1.11.2 | grep current +docker version | grep 1.13.1 +sudo ros engine list | grep 1.13.1 | grep current docker ps | grep nginx`) } @@ -43,18 +43,18 @@ func (s *QemuSuite) TestCustomDockerInPersistentConsole(c *C) { set -ex apt-get --version -docker version | grep 1.10.3 -sudo ros engine list | grep 1.10.3 | grep current +docker version | grep 17.06.0-ce +sudo ros engine list | grep 17.06.0-ce | grep current docker run -d --restart=always nginx docker ps | grep nginx`) s.CheckCall(c, ` set -ex -sudo ros engine switch docker-1.11.2 +sudo ros engine switch docker-1.12.6 /usr/sbin/wait-for-docker -docker version | grep 1.11.2 -sudo ros engine list | grep 1.11.2 | grep current +docker version | grep 1.12.6 +sudo ros engine list | grep 1.12.6 | grep current docker ps | grep nginx`) s.Reboot(c) @@ -62,7 +62,7 @@ docker ps | grep nginx`) s.CheckCall(c, ` set -ex -docker version | grep 1.11.2 -sudo ros engine list | grep 1.11.2 | grep current +docker version | grep 1.12.6 +sudo ros engine list | grep 1.12.6 | grep current docker ps | grep nginx`) } diff --git a/tests/upgrade_test.go b/tests/upgrade_test.go index 6bd79c66..a8b1062d 100755 --- a/tests/upgrade_test.go +++ b/tests/upgrade_test.go @@ -13,9 +13,9 @@ func (s *QemuSuite) TestUpgrade050(c *C) { // install 0.5.0, and then upgrade to `this` version s.commonTestCode(c, "v0.5.0", "default", "") } -func (s *QemuSuite) TestUpgrade061Docker1112(c *C) { - // Test that by setting the Docker version to 1.11.2 (not the default in 0.6.1), that upgrading leaves it as 1.11.2 - s.commonTestCode(c, "v0.6.1", "default", "1.11.2") +func (s *QemuSuite) TestUpgrade061Docker1131(c *C) { + // Test that by setting the Docker version to 1.13.1 (not the default in 0.6.1), that upgrading leaves it as 1.13.1 + s.commonTestCode(c, "v0.6.1", "default", "1.13.1") } func (s *QemuSuite) TestUpgrade061(c *C) { s.commonTestCode(c, "v0.6.1", "debian", "") From 2e60e54ab02b2a9b26d7e9ed8e4b7db2c5ab82da Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Fri, 18 Aug 2017 19:42:48 +0000 Subject: [PATCH 2/3] Disable the RancherOS 0.6.1 Docker 1.13.1 test for now Signed-off-by: Sven Dowideit --- tests/upgrade_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/upgrade_test.go b/tests/upgrade_test.go index a8b1062d..58734065 100755 --- a/tests/upgrade_test.go +++ b/tests/upgrade_test.go @@ -13,7 +13,7 @@ func (s *QemuSuite) TestUpgrade050(c *C) { // install 0.5.0, and then upgrade to `this` version s.commonTestCode(c, "v0.5.0", "default", "") } -func (s *QemuSuite) TestUpgrade061Docker1131(c *C) { +func (s *QemuSuite) DISABLEDTestUpgrade061Docker1131(c *C) { // Test that by setting the Docker version to 1.13.1 (not the default in 0.6.1), that upgrading leaves it as 1.13.1 s.commonTestCode(c, "v0.6.1", "default", "1.13.1") } From f27af999d9120b5f74107757a9279706c1720aea Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Thu, 24 Aug 2017 12:43:56 +1000 Subject: [PATCH 3/3] use 17.03.2 for amd64 and 17.03.1 for arm32 and arm64 Signed-off-by: Sven Dowideit --- os-config.tpl.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/os-config.tpl.yml b/os-config.tpl.yml index ddd3d2d9..1492caf6 100644 --- a/os-config.tpl.yml +++ b/os-config.tpl.yml @@ -7,10 +7,10 @@ rancher: hostname: {{.HOSTNAME_DEFAULT}} {{if eq "amd64" .ARCH -}} docker: - engine: docker-17.03.1-ce + engine: docker-17.03.2-ce {{else -}} docker: - engine: docker-1.12.6 + engine: docker-17.03.1-ce {{end -}} network: dns: @@ -325,9 +325,9 @@ rancher: - /opt:/opt docker: {{if eq "amd64" .ARCH -}} - image: {{.OS_REPO}}/os-docker:17.03.1{{.SUFFIX}} + image: {{.OS_REPO}}/os-docker:17.03.2{{.SUFFIX}} {{else -}} - image: {{.OS_REPO}}/os-docker:1.12.6{{.SUFFIX}} + image: {{.OS_REPO}}/os-docker:17.03.1{{.SUFFIX}} {{end -}} command: ros user-docker environment: @@ -367,9 +367,9 @@ rancher: image: {{.OS_REPO}}/os docker: {{if eq "amd64" .ARCH -}} - engine: docker-17.03.1-ce + engine: docker-17.03.2-ce {{else -}} - engine: docker-1.12.6 + engine: docker-17.03.1-ce {{end -}} storage_driver: overlay group: docker