Skip to content

Commit

Permalink
Update with modulesync
Browse files Browse the repository at this point in the history
  • Loading branch information
mcanevet committed Oct 19, 2015
1 parent eea464e commit 2c4a61b
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 10 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
---
language: ruby
sudo: false
addons:
apt:
packages:
- libaugeas-dev
cache: bundler
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"]
Expand Down
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ group :development, :unit_tests do
gem 'puppet-lint-file_source_rights-check', :require => false
gem 'puppet-lint-alias-check', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'github_changelog_generator', :require => false, :git => 'https://github.com/raphink/github-changelog-generator.git', :branch => 'dev/all_patches' if RUBY_VERSION !~ /^1.8/
gem 'ruby-augeas', :require => false
gem 'github_changelog_generator', :require => false if RUBY_VERSION !~ /^1.8/
gem 'puppet-blacksmith', :require => false if RUBY_VERSION !~ /^1.8/
end

Expand Down
4 changes: 2 additions & 2 deletions spec/acceptance/nodesets/centos-5-x86_64-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ HOSTS:
strict_variables:
platform: el-5-x86_64
hypervisor : docker
image: centos:5
image: tianon/centos:5.10
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'yum install -y crontabs tar wget'
- 'yum install -y crontabs tar wget which'
CONFIG:
type: foss
log_level: debug
1 change: 1 addition & 0 deletions spec/acceptance/nodesets/centos-6-x86_64-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ HOSTS:
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'rm -rf /var/run/network/*'
- 'yum install -y crontabs tar wget'
CONFIG:
type: foss
Expand Down
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/debian-6-x86_64-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ HOSTS:
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y wget'
- 'apt-get install -y cron locales-all net-tools wget'
CONFIG:
type: foss
log_level: debug
2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/debian-7-x86_64-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ HOSTS:
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y cron wget'
- 'apt-get install -y cron locales-all net-tools wget'
CONFIG:
type: foss
log_level: debug
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/debian-8-x86_64-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ HOSTS:
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y cron wget'
- 'apt-get install -y cron locales-all net-tools wget'
- 'rm -f /usr/sbin/policy-rc.d'
CONFIG:
type: foss
log_level: debug
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ HOSTS:
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y wget'
- 'apt-get install -y net-tools wget'
- 'locale-gen en_US.UTF-8'
CONFIG:
type: foss
log_level: debug
5 changes: 4 additions & 1 deletion spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ HOSTS:
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y wget'
- '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: foss
log_level: debug
5 changes: 4 additions & 1 deletion spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ HOSTS:
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y wget'
- '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: foss
log_level: debug
3 changes: 2 additions & 1 deletion spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ HOSTS:
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
- 'apt-get install -y wget'
- 'apt-get install -y net-tools wget'
- 'locale-gen en_US.UTF-8'
CONFIG:
type: foss
log_level: debug
16 changes: 16 additions & 0 deletions spec/acceptance/nodesets/ubuntu-15.10-x86_64-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
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: foss
log_level: debug

0 comments on commit 2c4a61b

Please sign in to comment.