Skip to content
Snippets Groups Projects
Commit bcb2de1e authored by Mickaël Canévet's avatar Mickaël Canévet
Browse files

Update with modulesync

parent 44313aa1
No related branches found
No related tags found
No related merge requests found
Showing with 201 additions and 9 deletions
...@@ -7,7 +7,7 @@ addons: ...@@ -7,7 +7,7 @@ addons:
- libaugeas-dev - libaugeas-dev
cache: bundler cache: bundler
bundler_args: --without system_tests bundler_args: --without system_tests
script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'", "bundle exec rake metadata"] script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'"]
matrix: matrix:
fast_finish: true fast_finish: true
include: include:
...@@ -25,49 +25,49 @@ matrix: ...@@ -25,49 +25,49 @@ matrix:
sudo: required sudo: required
dist: trusty dist: trusty
services: docker services: docker
env: BEAKER_set="debian-6-x86_64-docker" env: BEAKER_set="debian-6"
bundler_args: bundler_args:
script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
- rvm: default - rvm: default
sudo: required sudo: required
dist: trusty dist: trusty
services: docker services: docker
env: BEAKER_set="debian-7-x86_64-docker" env: BEAKER_set="debian-7"
bundler_args: bundler_args:
script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
- rvm: default - rvm: default
sudo: required sudo: required
dist: trusty dist: trusty
services: docker services: docker
env: BEAKER_set="debian-8-x86_64-docker" env: BEAKER_set="debian-8"
bundler_args: bundler_args:
script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
- rvm: default - rvm: default
sudo: required sudo: required
dist: trusty dist: trusty
services: docker services: docker
env: BEAKER_set="ubuntu-12.04-x86_64-docker" env: BEAKER_set="ubuntu-12.04"
bundler_args: bundler_args:
script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
- rvm: default - rvm: default
sudo: required sudo: required
dist: trusty dist: trusty
services: docker services: docker
env: BEAKER_set="ubuntu-14.04-x86_64-docker" env: BEAKER_set="ubuntu-14.04"
bundler_args: bundler_args:
script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
- rvm: default - rvm: default
sudo: required sudo: required
dist: trusty dist: trusty
services: docker services: docker
env: BEAKER_set="centos-6-x86_64-docker" env: BEAKER_set="centos-6"
bundler_args: bundler_args:
script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
- rvm: default - rvm: default
sudo: required sudo: required
dist: trusty dist: trusty
services: docker services: docker
env: BEAKER_set="centos-7-x86_64-docker" env: BEAKER_set="centos-7"
bundler_args: bundler_args:
script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb script: sudo service docker restart ; sleep 10 && bundle exec rspec spec/acceptance/*_spec.rb
notifications: notifications:
......
...@@ -22,7 +22,7 @@ group :development, :unit_tests do ...@@ -22,7 +22,7 @@ group :development, :unit_tests do
gem 'puppet-lint-alias-check', :require => false gem 'puppet-lint-alias-check', :require => false
gem 'rspec-puppet-facts', :require => false gem 'rspec-puppet-facts', :require => false
gem 'ruby-augeas', :require => false gem 'ruby-augeas', :require => false
gem 'github_changelog_generator', :require => false if RUBY_VERSION !~ /^1\.8/ gem 'github_changelog_generator', '< 1.10.2', :require => false if RUBY_VERSION !~ /^1\.8/
gem 'puppet-blacksmith', :require => false if RUBY_VERSION !~ /^1\./ gem 'puppet-blacksmith', :require => false if RUBY_VERSION !~ /^1\./
end end
......
HOSTS:
centos-5-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-5-x86_64
hypervisor : docker
image: tianon/centos:5.10
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'yum install -y crontabs tar wget which'
CONFIG:
type: aio
log_level: debug
HOSTS:
centos-6-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-6-x86_64
hypervisor : docker
image: centos:6
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'rm -rf /var/run/network/*'
- 'yum install -y crontabs tar wget'
CONFIG:
type: aio
log_level: debug
HOSTS:
centos-7-x64:
default_apply_opts:
order: random
strict_variables:
platform: el-7-x86_64
hypervisor : docker
image: centos:7
docker_preserve_image: true
docker_cmd: '["/usr/sbin/init"]'
docker_image_commands:
- 'yum install -y crontabs tar wget'
CONFIG:
type: aio
log_level: debug
HOSTS:
debian-6-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-6-amd64
hypervisor : docker
image: debian:6
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y cron locales-all net-tools wget'
CONFIG:
type: aio
log_level: debug
HOSTS:
debian-7-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-7-amd64
hypervisor : docker
image: debian:7
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y cron locales-all net-tools wget'
CONFIG:
type: aio
log_level: debug
HOSTS:
debian-8-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-8-amd64
hypervisor : docker
image: debian:8
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y cron locales-all net-tools wget'
- 'rm -f /usr/sbin/policy-rc.d'
CONFIG:
type: aio
log_level: debug
HOSTS:
ubuntu-1204-x64:
default_apply_opts:
order: random
strict_variables:
platform: ubuntu-12.04-amd64
hypervisor : docker
image: ubuntu:12.04
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y net-tools wget'
- 'locale-gen en_US.UTF-8'
CONFIG:
type: aio
log_level: debug
HOSTS:
ubuntu-1404-x64:
default_apply_opts:
order: random
strict_variables:
platform: ubuntu-14.04-amd64
hypervisor : docker
image: ubuntu:14.04
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'rm /usr/sbin/policy-rc.d'
- 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
- 'apt-get install -y net-tools wget'
- 'locale-gen en_US.UTF-8'
CONFIG:
type: aio
log_level: debug
HOSTS:
ubuntu-1410-x64:
default_apply_opts:
order: random
strict_variables:
platform: ubuntu-14.10-amd64
hypervisor : docker
image: ubuntu:14.10
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'rm /usr/sbin/policy-rc.d'
- 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
- 'apt-get install -y net-tools wget'
- 'locale-gen en_US.UTF-8'
CONFIG:
type: aio
log_level: debug
HOSTS:
ubuntu-1504-x64:
default_apply_opts:
order: random
strict_variables:
platform: ubuntu-15.04-amd64
hypervisor : docker
image: ubuntu:15.04
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y net-tools wget'
- 'locale-gen en_US.UTF-8'
CONFIG:
type: aio
log_level: debug
HOSTS:
ubuntu-1510-x64:
default_apply_opts:
order: random
strict_variables:
platform: ubuntu-15.10-amd64
hypervisor : docker
image: ubuntu:15.10
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y net-tools wget'
- 'locale-gen en_US.UTF-8'
CONFIG:
type: aio
log_level: debug
HOSTS:
ubuntu-1604-x64:
default_apply_opts:
order: random
strict_variables:
platform: ubuntu-16.04-amd64
hypervisor : docker
image: ubuntu:16.04
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y net-tools wget'
- 'locale-gen en_US.UTF-8'
CONFIG:
type: aio
log_level: debug
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment