diff --git a/Gemfile b/Gemfile index 0874b4d9..7daea050 100755 --- a/Gemfile +++ b/Gemfile @@ -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" diff --git a/spec/acceptance/compose_spec.rb b/spec/acceptance/compose_spec.rb deleted file mode 100644 index 07813712..00000000 --- a/spec/acceptance/compose_spec.rb +++ /dev/null @@ -1,123 +0,0 @@ -require 'spec_helper_acceptance' - -broken = false - -if fact('osfamily') == 'windows' - puts "Not implemented on Windows" - broken = true -elsif fact('osfamily') == 'RedHat' - docker_args = "repo_opt => '--enablerepo=localmirror-extras'" -end - -describe 'docker compose', :win_broken => broken do - before(:all) do - install_code = <<-code - class { 'docker': #{docker_args}} - class { 'docker::compose': } - code - apply_manifest(install_code, :catch_failures=>true) - end - - describe command("docker-compose --help") do - its(:exit_status) { should eq 0 } - end - - context 'Creating compose projects' do - before(:all) do - @install = <<-code -docker_compose { 'test3': - compose_files => ['#{tmp_path}/docker-compose.yml'], - ensure => present, -} - code - apply_manifest(@install, :catch_failures=>true) - end - - it 'should be idempotent' do - apply_manifest(@install, :catch_changes=>true) - end - - describe command("docker inspect test3_compose_test_1"), :sudo => true do - its(:exit_status) { should eq 0 } - end - end - - context 'Destroying compose projects' do - before(:all) do - install = <<-code -docker_compose { 'test4': - compose_files => ['#{tmp_path}/docker-compose.yml'], - ensure => present, -} - code - apply_manifest(install, :catch_failures=>true) - @uninstall = <<-code -docker_compose { 'test4': - compose_files => ['#{tmp_path}/docker-compose.yml'], - ensure => absent, -} - code - apply_manifest(@uninstall, :catch_failures=>true) - end - - it 'should be idempotent' do - apply_manifest(@uninstall, :catch_changes=>true) - end - - describe command("docker inspect test4_compose_test_1"), :sudo => true do - its(:exit_status) { should eq 1 } - end - end - - context 'Requesting a specific version of compose' do - before(:all) do - @version = '1.5.1' - @pp = <<-code - class { 'docker::compose': - version => '#{@version}', - } - code - apply_manifest(@pp, :catch_failures=>true) - end - - it 'should be idempotent' do - apply_manifest(@pp, :catch_changes=>true) - end - - it 'should have installed the requested version' do - shell('docker-compose --version', :acceptable_exit_codes => [0]) do |r| - expect(r.stdout).to match(/#{@version}/) - end - end - end - - context 'Removing docker compose' do - before(:all) do - @version = '1.7.0' - @pp = <<-code - class { 'docker::compose': - ensure => absent, - version => '#{@version}', - } - code - apply_manifest(@pp, :catch_failures=>true) - end - - it 'should be idempotent' do - apply_manifest(@pp, :catch_changes=>true) - end - - it 'should have removed the relevant files' do - shell('test -e /usr/local/bin/docker-compose', :acceptable_exit_codes => [1]) - shell("test -e /usr/local/bin/docker-compose-#{@version}", :acceptable_exit_codes => [1]) - end - - after(:all) do - install_code = <<-code - class { 'docker': } - class { 'docker::compose': } - code - apply_manifest(install_code, :catch_failures=>true) - end - end -end diff --git a/spec/acceptance/compose_v2_spec.rb b/spec/acceptance/compose_v2_spec.rb deleted file mode 100644 index 2f53cdbf..00000000 --- a/spec/acceptance/compose_v2_spec.rb +++ /dev/null @@ -1,120 +0,0 @@ -require 'spec_helper_acceptance' - -broken = false - -if fact('osfamily') == 'windows' - puts "Not implemented on Windows" - broken = true -elsif fact('osfamily') == 'RedHat' - docker_args = "repo_opt => '--enablerepo=localmirror-extras'" -end - -describe 'docker compose', :win_broken => broken do - before(:all) do - install_code = <<-code - class { 'docker': #{docker_args}} - class { 'docker::compose': } - code - apply_manifest(install_code, :catch_failures=>true) - end - - describe command("docker-compose --help") do - its(:exit_status) { should eq 0 } - end - - context 'Creating compose v2 projects' do - before(:all) do - @install = <<-code -docker_compose { '/tmp/docker-compose-v2.yml': - ensure => present, -} - code - apply_manifest(@install, :catch_failures=>true) - end - - it 'should be idempotent' do - apply_manifest(@install, :catch_changes=>true) - end - - describe command("docker inspect tmp_compose_test_1"), :sudo => true do - its(:exit_status) { should eq 0 } - end - end - - context 'Destroying compose v2 projects' do - before(:all) do - install = <<-code -docker_compose { '/tmp/docker-compose-v2.yml': - ensure => present, -} - code - apply_manifest(install, :catch_failures=>true) - @uninstall = <<-code -docker_compose { '/tmp/docker-compose-v2.yml': - ensure => absent, -} - code - apply_manifest(@uninstall, :catch_failures=>true) - end - - it 'should be idempotent' do - apply_manifest(@uninstall, :catch_changes=>true) - end - - describe command("docker inspect tmp_compose_test_1"), :sudo => true do - its(:exit_status) { should eq 1 } - end - end - - context 'Requesting a specific version of compose' do - before(:all) do - @version = '1.6.2' - @pp = <<-code - class { 'docker::compose': - version => '#{@version}', - } - code - apply_manifest(@pp, :catch_failures=>true) - end - - it 'should be idempotent' do - apply_manifest(@pp, :catch_changes=>true) - end - - it 'should have installed the requested version' do - shell('docker-compose --version', :acceptable_exit_codes => [0]) do |r| - expect(r.stdout).to match(/#{@version}/) - end - end - end - - context 'Removing docker compose' do - before(:all) do - @version = '1.7.0' - @pp = <<-code - class { 'docker::compose': - ensure => absent, - version => '#{@version}', - } - code - apply_manifest(@pp, :catch_failures=>true) - end - - it 'should be idempotent' do - apply_manifest(@pp, :catch_changes=>true) - end - - it 'should have removed the relevant files' do - shell('test -e /usr/local/bin/docker-compose', :acceptable_exit_codes => [1]) - shell("test -e /usr/local/bin/docker-compose-#{@version}", :acceptable_exit_codes => [1]) - end - - after(:all) do - install_code = <<-code - class { 'docker': } - class { 'docker::compose': } - code - apply_manifest(install_code, :catch_failures=>true) - end - end -end diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index d77427ba..b4587d71 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -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: @@ -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)