Skip to content

Commit

Permalink
Merge pull request #452 from ekohl/msync-docker
Browse files Browse the repository at this point in the history
Rely on beaker-hostgenerator for docker nodesets
  • Loading branch information
bastelfreak authored May 13, 2018
2 parents e39f5e6 + dcc5983 commit dcd2ea4
Show file tree
Hide file tree
Showing 14 changed files with 46 additions and 215 deletions.
2 changes: 1 addition & 1 deletion .msync.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
modulesync_config_version: '1.9.1'
modulesync_config_version: '1.9.2'
18 changes: 9 additions & 9 deletions .sync.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
---
.travis.yml:
docker_sets:
- set: docker/ubuntu-16.04
- set: ubuntu1604-64
options:
script: 'bundle exec rspec spec/acceptance/php56_spec.rb'
- set: docker/ubuntu-14.04
- set: ubuntu1404-64
options:
script: 'bundle exec rspec spec/acceptance/php56_spec.rb'
- set: docker/centos-7
- set: centos7-64
options:
script: 'bundle exec rspec spec/acceptance/php56_spec.rb'
- set: docker/debian-7
- set: debian7-64
options:
script: 'bundle exec rspec spec/acceptance/php56_spec.rb'
- set: docker/ubuntu-16.04
- set: ubuntu1604-64
options:
script: 'bundle exec rspec spec/acceptance/php_spec.rb'
- set: docker/ubuntu-14.04
- set: ubuntu1404-64
options:
script: 'bundle exec rspec spec/acceptance/php_spec.rb'
- set: docker/centos-7
- set: centos7-64
options:
script: 'bundle exec rspec spec/acceptance/php_spec.rb'
- set: docker/debian-9
- set: debian9-64
options:
script: 'bundle exec rspec spec/acceptance/php_spec.rb'
- set: docker/debian-8
- set: debian8-64
options:
script: 'bundle exec rspec spec/acceptance/php_spec.rb'
secure: "GOhttACuJt+3s38m4WnW5RuTgwqaAoeEQnNT+X1Ukn7KdcIk4KV8NzYU/CC0VIm8lUOnBWYJKEC4ixX/J/4Wbxox2RAoKMQrO++L0DB1zTCJnq9SfoUBMaQhXvLu+PbxAR0p3P47ozra0C+pOWDpOaxT9ecufrPQt9W9Z4aY/bs="
51 changes: 27 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ sudo: false
dist: trusty
language: ruby
cache: bundler
# related to https://github.com/rubygems/rubygems/issues/2123
before_install:
- rm -f Gemfile.lock
- 'rm -f Gemfile.lock'
- 'gem update --system'
- 'gem install bundler'
script:
- 'bundle exec rake $CHECK'
matrix:
Expand All @@ -13,78 +16,78 @@ matrix:
- rvm: 2.1.9
bundler_args: --without system_tests development release
env: PUPPET_VERSION="~> 4.0" CHECK=test PARALLEL_TEST_PROCESSORS=12
- rvm: 2.4.3
- rvm: 2.4.4
bundler_args: --without system_tests development release
env: PUPPET_VERSION="~> 5.0" CHECK=test_with_coveralls
- rvm: 2.5.0
env: PUPPET_VERSION="~> 5.0" CHECK=test
- rvm: 2.5.1
bundler_args: --without system_tests development release
env: PUPPET_VERSION="~> 5.0" CHECK=test_with_coveralls
- rvm: 2.4.3
- rvm: 2.4.4
bundler_args: --without system_tests development release
env: PUPPET_VERSION="~> 5.0" CHECK=rubocop
- rvm: 2.4.3
- rvm: 2.5.1
bundler_args: --without system_tests development release
env: PUPPET_VERSION="~> 5.0" CHECK=build DEPLOY_TO_FORGE=yes
- rvm: 2.4.3
- rvm: 2.5.1
bundler_args: --without development release
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04 CHECK=beaker
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=ubuntu1604-64{hypervisor=docker} CHECK=beaker
script: bundle exec rspec spec/acceptance/php56_spec.rb
services: docker
sudo: required
- rvm: 2.4.3
- rvm: 2.5.1
bundler_args: --without development release
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 CHECK=beaker
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=ubuntu1404-64{hypervisor=docker} CHECK=beaker
script: bundle exec rspec spec/acceptance/php56_spec.rb
services: docker
sudo: required
- rvm: 2.4.3
- rvm: 2.5.1
bundler_args: --without development release
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 CHECK=beaker
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker} CHECK=beaker
script: bundle exec rspec spec/acceptance/php56_spec.rb
services: docker
sudo: required
- rvm: 2.4.3
- rvm: 2.5.1
bundler_args: --without development release
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/debian-7 CHECK=beaker
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=debian7-64{hypervisor=docker} CHECK=beaker
script: bundle exec rspec spec/acceptance/php56_spec.rb
services: docker
sudo: required
- rvm: 2.4.3
- rvm: 2.5.1
bundler_args: --without development release
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04 CHECK=beaker
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=ubuntu1604-64{hypervisor=docker} CHECK=beaker
script: bundle exec rspec spec/acceptance/php_spec.rb
services: docker
sudo: required
- rvm: 2.4.3
- rvm: 2.5.1
bundler_args: --without development release
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04 CHECK=beaker
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=ubuntu1404-64{hypervisor=docker} CHECK=beaker
script: bundle exec rspec spec/acceptance/php_spec.rb
services: docker
sudo: required
- rvm: 2.4.3
- rvm: 2.5.1
bundler_args: --without development release
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7 CHECK=beaker
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=centos7-64{hypervisor=docker} CHECK=beaker
script: bundle exec rspec spec/acceptance/php_spec.rb
services: docker
sudo: required
- rvm: 2.4.3
- rvm: 2.5.1
bundler_args: --without development release
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/debian-9 CHECK=beaker
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=debian9-64{hypervisor=docker} CHECK=beaker
script: bundle exec rspec spec/acceptance/php_spec.rb
services: docker
sudo: required
- rvm: 2.4.3
- rvm: 2.5.1
bundler_args: --without development release
dist: trusty
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/debian-8 CHECK=beaker
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_setfile=debian8-64{hypervisor=docker} CHECK=beaker
script: bundle exec rspec spec/acceptance/php_spec.rb
services: docker
sudo: required
Expand Down
9 changes: 5 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ group :development do
end

group :system_tests do
gem 'winrm', :require => false
gem 'winrm', :require => false
if beaker_version = ENV['BEAKER_VERSION']
gem 'beaker', *location_for(beaker_version)
else
Expand All @@ -51,9 +51,10 @@ group :system_tests do
else
gem 'beaker-rspec', :require => false
end
gem 'serverspec', :require => false
gem 'beaker-puppet_install_helper', :require => false
gem 'beaker-module_install_helper', :require => false
gem 'serverspec', :require => false
gem 'beaker-hostgenerator', '>= 1.1.10', :require => false
gem 'beaker-puppet_install_helper', :require => false
gem 'beaker-module_install_helper', :require => false
end

group :release do
Expand Down
19 changes: 0 additions & 19 deletions spec/acceptance/nodesets/docker/centos-5.yml

This file was deleted.

20 changes: 0 additions & 20 deletions spec/acceptance/nodesets/docker/centos-6.yml

This file was deleted.

19 changes: 0 additions & 19 deletions spec/acceptance/nodesets/docker/centos-7.yml

This file was deleted.

18 changes: 0 additions & 18 deletions spec/acceptance/nodesets/docker/debian-7.yml

This file was deleted.

20 changes: 0 additions & 20 deletions spec/acceptance/nodesets/docker/debian-8.yml

This file was deleted.

20 changes: 0 additions & 20 deletions spec/acceptance/nodesets/docker/debian-9.yml

This file was deleted.

19 changes: 0 additions & 19 deletions spec/acceptance/nodesets/docker/ubuntu-12.04.yml

This file was deleted.

21 changes: 0 additions & 21 deletions spec/acceptance/nodesets/docker/ubuntu-14.04.yml

This file was deleted.

21 changes: 0 additions & 21 deletions spec/acceptance/nodesets/docker/ubuntu-16.04.yml

This file was deleted.

4 changes: 4 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
require 'rspec-puppet-facts'
include RspecPuppetFacts

# This file is managed via modulesync
# https://github.com/voxpupuli/modulesync
# https://github.com/voxpupuli/modulesync_config

if Dir.exist?(File.expand_path('../../lib', __FILE__))
require 'coveralls'
require 'simplecov'
Expand Down

0 comments on commit dcd2ea4

Please sign in to comment.