Skip to content

pinning puppet version to fix failing spec tests #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 27, 2018
Merged

pinning puppet version to fix failing spec tests #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
272e68c
CLOUD-2146-cleanup-of-cocker-compose-acceptance-tests (#341)
Sep 27, 2018
3c62ac4
pinning puppet version to fix failing spec tests
Sep 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ group :test do
elsif puppet_git_url = ENV['PUPPET_GIT_URL']
gem "puppet", :git => puppet_git_url
else
gem "puppet"
gem "puppet", "5.5.6"
end
gem "puppet-lint", "2.3.3"
gem "puppet-lint-unquoted_string-check", "0.3.0"
Expand Down
123 changes: 0 additions & 123 deletions spec/acceptance/compose_spec.rb
View file
Open in desktop

This file was deleted.

120 changes: 0 additions & 120 deletions spec/acceptance/compose_v2_spec.rb
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions spec/spec_helper_acceptance.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,36 +73,6 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
on(host, 'yum install -y net-tools device-mapper')
end

docker_compose_content = <<-EOS
compose_test:
image: ubuntu:14.04
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
extends_service:
extends: compose_test
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
extends_extends_service:
extends: extends_service
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
second_test:
image: ubuntu:14.04
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
EOS
docker_compose_content_v2 = <<-EOS
version: "2"
services:
compose_test:
image: ubuntu:14.04
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
extends_service:
extends: compose_test
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
extends_extends_service:
extends: extends_service
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
second_test:
image: ubuntu:14.04
command: /bin/sh -c "while true; do echo hello world; sleep 1; done"
EOS
docker_compose_content_v3 = <<-EOS
version: "3.4"
services:
Expand Down Expand Up @@ -139,8 +109,6 @@ def retry_on_error_matching(max_retry_count = 3, retry_wait_interval_secs = 5, e
external:
name: nat
EOS
create_remote_file(host, "/tmp/docker-compose.yml", docker_compose_content)
create_remote_file(host, "/tmp/docker-compose-v2.yml", docker_compose_content_v2)
if fact_on(host, 'osfamily') == 'windows'
create_remote_file(host, "/tmp/docker-compose-v3.yml", docker_compose_content_v3_windows)
create_remote_file(host, "/tmp/docker-compose-override-v3.yml", docker_compose_override_v3_windows)
Expand Down