rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-13 04:16:37 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2056 from SvenDowideit/remove-docker-1.10and1.11

Browse Source 
WIP: Remove docker 1.10 and 1.11 support from RancherOS v1.11
This commit is contained in:
Sven Dowideit 2017-08-24 12:57:09 +10:00 committed by GitHub
commit 3650b75377
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
os-config.tpl.yml
View File

@ -7,10 +7,10 @@ rancher:
hostname: {{.HOSTNAME_DEFAULT}} hostname: {{.HOSTNAME_DEFAULT}}
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
docker: docker:
engine: docker-17.03.1-ce engine: docker-17.03.2-ce
{{else -}} {{else -}}
docker: docker:
engine: docker-1.11.2 engine: docker-17.03.1-ce
{{end -}} {{end -}}
network: network:
dns: dns:
@ -325,9 +325,9 @@ rancher:
- /opt:/opt - /opt:/opt
docker: docker:
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
image: {{.OS_REPO}}/os-docker:17.03.1{{.SUFFIX}} image: {{.OS_REPO}}/os-docker:17.03.2{{.SUFFIX}}
{{else -}} {{else -}}
image: {{.OS_REPO}}/os-docker:1.11.2{{.SUFFIX}} image: {{.OS_REPO}}/os-docker:17.03.1{{.SUFFIX}}
{{end -}} {{end -}}
command: ros user-docker command: ros user-docker
environment: environment:
@ -367,9 +367,9 @@ rancher:
image: {{.OS_REPO}}/os image: {{.OS_REPO}}/os
docker: docker:
{{if eq "amd64" .ARCH -}} {{if eq "amd64" .ARCH -}}
engine: docker-17.03.1-ce engine: docker-17.03.2-ce
{{else -}} {{else -}}
engine: docker-1.11.2 engine: docker-17.03.1-ce
{{end -}} {{end -}}
storage_driver: overlay storage_driver: overlay
group: docker group: docker

2
tests/assets/test_05/cloud-config.yml
View File

@ -1,6 +1,6 @@
#cloud-config #cloud-config
rancher: rancher:
docker: docker:
engine: docker-1.10.3 engine: docker-1.12.6
ssh_authorized_keys: ssh_authorized_keys:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF

2
tests/assets/test_12/cloud-config1.11.2.yml → tests/assets/test_12/cloud-config1.13.1.yml
View File

@ -3,4 +3,4 @@ ssh_authorized_keys:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF
rancher: rancher:
docker: docker:
engine: docker-1.11.2 engine: docker-1.13.1

2
tests/assets/test_25/cloud-config.yml
View File

@ -2,6 +2,6 @@
rancher: rancher:
console: debian console: debian
docker: docker:
engine: docker-1.10.3 engine: docker-17.06.0-ce
ssh_authorized_keys: ssh_authorized_keys:
- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC85w9stZyiLQp/DkVO6fqwiShYcj1ClKdtCqgHtf+PLpJkFReSFu8y21y+ev09gsSMRRrjF7yt0pUHV6zncQhVeqsZtgc5WbELY2DOYUGmRn/CCvPbXovoBrQjSorqlBmpuPwsStYLr92Xn+VVsMNSUIegHY22DphGbDKG85vrKB8HxUxGIDxFBds/uE8FhSy+xsoyT/jUZDK6pgq2HnGl6D81ViIlKecpOpWlW3B+fea99ADNyZNVvDzbHE5pcI3VRw8u59WmpWOUgT6qacNVACl8GqpBvQk8sw7O/X9DSZHCKafeD9G5k+GYbAUz92fKWrx/lOXfUXPS3+c8dRIF

28
tests/custom_docker_test.go
View File

@ -8,9 +8,9 @@ func (s *QemuSuite) TestCustomDocker(c *C) {
s.CheckCall(c, ` s.CheckCall(c, `
set -ex 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 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" (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, ` s.CheckCall(c, `
set -ex set -ex
sudo ros engine switch docker-1.11.2 sudo ros engine switch docker-1.13.1
/usr/sbin/wait-for-docker /usr/sbin/wait-for-docker
docker version | grep 1.11.2 docker version | grep 1.13.1
sudo ros engine list | grep 1.11.2 | grep current sudo ros engine list | grep 1.13.1 | grep current
docker ps | grep nginx`) docker ps | grep nginx`)
s.Reboot(c) s.Reboot(c)
@ -31,8 +31,8 @@ docker ps | grep nginx`)
s.CheckCall(c, ` s.CheckCall(c, `
set -ex set -ex
docker version | grep 1.11.2 docker version | grep 1.13.1
sudo ros engine list | grep 1.11.2 | grep current sudo ros engine list | grep 1.13.1 | grep current
docker ps | grep nginx`) docker ps | grep nginx`)
} }
@ -43,18 +43,18 @@ func (s *QemuSuite) TestCustomDockerInPersistentConsole(c *C) {
set -ex set -ex
apt-get --version apt-get --version
docker version | grep 1.10.3 docker version | grep 17.06.0-ce
sudo ros engine list | grep 1.10.3 | grep current sudo ros engine list | grep 17.06.0-ce | grep current
docker run -d --restart=always nginx docker run -d --restart=always nginx
docker ps | grep nginx`) docker ps | grep nginx`)
s.CheckCall(c, ` s.CheckCall(c, `
set -ex set -ex
sudo ros engine switch docker-1.11.2 sudo ros engine switch docker-1.12.6
/usr/sbin/wait-for-docker /usr/sbin/wait-for-docker
docker version | grep 1.11.2 docker version | grep 1.12.6
sudo ros engine list | grep 1.11.2 | grep current sudo ros engine list | grep 1.12.6 | grep current
docker ps | grep nginx`) docker ps | grep nginx`)
s.Reboot(c) s.Reboot(c)
@ -62,7 +62,7 @@ docker ps | grep nginx`)
s.CheckCall(c, ` s.CheckCall(c, `
set -ex set -ex
docker version | grep 1.11.2 docker version | grep 1.12.6
sudo ros engine list | grep 1.11.2 | grep current sudo ros engine list | grep 1.12.6 | grep current
docker ps | grep nginx`) docker ps | grep nginx`)
} }

6
tests/upgrade_test.go
View File

@ -13,9 +13,9 @@ func (s *QemuSuite) TestUpgrade050(c *C) {
// install 0.5.0, and then upgrade to `this` version // install 0.5.0, and then upgrade to `this` version
s.commonTestCode(c, "v0.5.0", "default", "") s.commonTestCode(c, "v0.5.0", "default", "")
} }
func (s *QemuSuite) TestUpgrade061Docker1112(c *C) { func (s *QemuSuite) DISABLEDTestUpgrade061Docker1131(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 // 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.11.2") s.commonTestCode(c, "v0.6.1", "default", "1.13.1")
} }
func (s *QemuSuite) TestUpgrade061(c *C) { func (s *QemuSuite) TestUpgrade061(c *C) {
s.commonTestCode(c, "v0.6.1", "debian", "") s.commonTestCode(c, "v0.6.1", "debian", "")