Skip to content

Commit e6d26c2

Browse files
MarkWsheenaajay
MarkW
authored andcommitted
CLOUD-2146-cleanup-of-cocker-compose-acceptance-tests (#341) (#344)
1 parent a2b40c1 commit e6d26c2

File tree

3 files changed

+0
-275
lines changed

3 files changed

+0
-275
lines changed

Diff for: spec/acceptance/compose_spec.rb

-123
This file was deleted.

Diff for: spec/acceptance/compose_v2_spec.rb

-120
This file was deleted.

Diff for: spec/spec_helper_acceptance.rb

-32
Original file line numberDiff line numberDiff line change
@@ -73,36 +73,6 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
7373
on(host, 'yum install -y net-tools device-mapper')
7474
end
7575

76-
docker_compose_content = <<-EOS
77-
compose_test:
78-
image: ubuntu:14.04
79-
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
80-
extends_service:
81-
extends: compose_test
82-
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
83-
extends_extends_service:
84-
extends: extends_service
85-
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
86-
second_test:
87-
image: ubuntu:14.04
88-
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
89-
EOS
90-
docker_compose_content_v2 = <<-EOS
91-
version: "2"
92-
services:
93-
compose_test:
94-
image: ubuntu:14.04
95-
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
96-
extends_service:
97-
extends: compose_test
98-
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
99-
extends_extends_service:
100-
extends: extends_service
101-
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
102-
second_test:
103-
image: ubuntu:14.04
104-
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
105-
EOS
10676
docker_compose_content_v3 = <<-EOS
10777
version: "3.4"
10878
services:
@@ -139,8 +109,6 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
139109
external:
140110
name: nat
141111
EOS
142-
create_remote_file(host, "/tmp/docker-compose.yml", docker_compose_content)
143-
create_remote_file(host, "/tmp/docker-compose-v2.yml", docker_compose_content_v2)
144112
if fact_on(host, 'osfamily') == 'windows'
145113
create_remote_file(host, "/tmp/docker-compose-v3.yml", docker_compose_content_v3_windows)
146114
create_remote_file(host, "/tmp/docker-compose-override-v3.yml", docker_compose_override_v3_windows)

0 commit comments

Comments
 (0)