Skip to content

Commit afe885c

Browse files
committed
(MODULES-9029) Fix Windows acceptance tests
After having made changes to get Windows tests working with Server 2016, the image we changed to "winamd64/hello-world" has removed support for Server 2016. As such I have changed occurances of it to "winamd64/hello-seattle" which still has support.
1 parent a2fa909 commit afe885c

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

spec/acceptance/docker_custom_source_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
if fact('osfamily') == 'windows'
66
docker_args = 'docker_ee => true, docker_ee_source_location => "https://download.docker.com/components/engine/windows-server/17.06/docker-17.06.2-ee-14.zip"'
7-
default_image = 'winamd64/hello-world'
7+
default_image = 'winamd64/hello-seattle'
88
# The default args are set because:
99
# restart => 'always' - there is no service created to manage containers
1010
# net => 'nat' - docker uses bridged by default when running a container. When installing docker on windows the default network is NAT.

spec/acceptance/docker_full_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
if fact('kernel') == 'windows'
44
docker_args = 'docker_ee => true'
5-
default_image = 'winamd64/hello-world'
5+
default_image = 'winamd64/hello-seattle'
66
default_image_tag = 'nanoserver-sac2016'
7-
default_digest = 'sha256:88f6207b9281e60dc4a91008e68b542cc7350d06985c7fc3c5132e6f6b9b3ebe'
7+
default_digest = 'sha256:dcba85354678b50608b8c40ec6d17cce063a224aa0e12b6a55dc47b67f039e75'
88
second_image = 'winamd64/hola-mundo'
99
default_dockerfile = 'C:/Users/Administrator/AppData/Local/Temp/Dockerfile'
1010
dockerfile_test = 'C:/Windows/Dockerfile_test.txt'

spec/acceptance_swarm/swarm_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
if fact('osfamily') == 'windows'
44
docker_args = 'docker_ee => true'
5-
test_docker_image = 'hello-world:nanoserver'
5+
test_docker_image = 'hello-seattle:nanoserver'
66
test_docker_command = 'cmd.exe /C "ping /t 8.8.8.8"'
77
else
88
docker_args = ''

spec/spec_helper_acceptance.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
126126
version: "3"
127127
services:
128128
compose_test:
129-
image: winamd64/hello-world
129+
image: winamd64/hello-seattle
130130
command: cmd.exe /C "ping 8.8.8.8 -t"
131131
networks:
132132
default:
@@ -137,7 +137,7 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
137137
version: "3"
138138
services:
139139
compose_test:
140-
image: winamd64/hello-world:nanoserver-sac2016
140+
image: winamd64/hello-seattle:nanoserver-sac2016
141141
command: cmd.exe /C "ping 8.8.8.8 -t"
142142
networks:
143143
default:
@@ -148,14 +148,14 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
148148
version: "3"
149149
services:
150150
compose_test:
151-
image: winamd64/hello-world
151+
image: winamd64/hello-seattle
152152
command: cmd.exe /C "ping 8.8.8.8 -t"
153153
EOS
154154
docker_stack_override_windows = <<-EOS
155155
version: "3"
156156
services:
157157
compose_test:
158-
image: winamd64/hello-world:nanoserver-sac2016
158+
image: winamd64/hello-seattle:nanoserver-sac2016
159159
EOS
160160
if fact_on(host, 'osfamily') == 'windows'
161161
create_remote_file(host, '/tmp/docker-compose-v3.yml', docker_compose_content_v3_windows)

0 commit comments

Comments
 (0)