Skip to content

Commit

Permalink
Update with modulesync
Browse files Browse the repository at this point in the history
  • Loading branch information
mcanevet committed May 4, 2016
1 parent 7cb0483 commit f5048ab
Show file tree
Hide file tree
Showing 15 changed files with 210 additions and 14 deletions.
10 changes: 7 additions & 3 deletions .travis.yml
@@ -1,9 +1,13 @@
---
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"]
script: ["bundle exec rake validate", "bundle exec rake lint", "bundle exec rake spec SPEC_OPTS='--format documentation'"]
matrix:
fast_finish: true
include:
Expand All @@ -15,7 +19,7 @@ matrix:
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.0.0
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.6
- rvm: 2.1.7
env: PUPPET_GEM_VERSION="~> 4.0"
notifications:
email: false
Expand All @@ -29,4 +33,4 @@ deploy:
# all_branches is required to use tags
all_branches: true
# Only publish if our main Ruby target builds
rvm: 1.9.3
rvm: 2.1.7
8 changes: 4 additions & 4 deletions Gemfile
@@ -1,8 +1,8 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"

group :development, :unit_tests do
gem 'rake', :require => false
gem 'rspec', '< 3.2', :require => false if RUBY_VERSION =~ /^1.8/
gem 'rake', ' < 11.0', :require => false if RUBY_VERSION =~ /^1\.8/
gem 'rspec', '< 3.2', :require => false if RUBY_VERSION =~ /^1\.8/
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
gem 'metadata-json-lint', :require => false
Expand All @@ -21,8 +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 'puppet-blacksmith', :require => false if RUBY_VERSION !~ /^1.8/
gem 'ruby-augeas', :require => false
gem 'puppet-blacksmith', :require => false if RUBY_VERSION !~ /^1\./
end

group :system_tests do
Expand Down
14 changes: 7 additions & 7 deletions Rakefile
Expand Up @@ -11,13 +11,13 @@ end
PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"]

# Publishing tasks
unless RUBY_VERSION =~ /^1\.8/
unless RUBY_VERSION =~ /^1\./
require 'puppet_blacksmith'
require 'puppet_blacksmith/rake_tasks'
require 'github_changelog_generator/task'
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
m = Blacksmith::Modulefile.new
config.future_release = m.version
config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s"
end
#require 'github_changelog_generator/task'
#GitHubChangelogGenerator::RakeTask.new :changelog do |config|
# m = Blacksmith::Modulefile.new
# config.future_release = m.version
# config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s"
#end
end
15 changes: 15 additions & 0 deletions spec/acceptance/nodesets/centos-5.yml
@@ -0,0 +1,15 @@
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
16 changes: 16 additions & 0 deletions spec/acceptance/nodesets/centos-6.yml
@@ -0,0 +1,16 @@
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
15 changes: 15 additions & 0 deletions spec/acceptance/nodesets/centos-7.yml
@@ -0,0 +1,15 @@
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
15 changes: 15 additions & 0 deletions spec/acceptance/nodesets/debian-6.yml
@@ -0,0 +1,15 @@
HOSTS:
debian-6-x64:
default_apply_opts:
order: random
strict_variables:
platform: debian-6-amd64
hypervisor : docker
image: debian/eol:squeeze
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
15 changes: 15 additions & 0 deletions spec/acceptance/nodesets/debian-7.yml
@@ -0,0 +1,15 @@
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
16 changes: 16 additions & 0 deletions spec/acceptance/nodesets/debian-8.yml
@@ -0,0 +1,16 @@
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
16 changes: 16 additions & 0 deletions spec/acceptance/nodesets/ubuntu-12.04.yml
@@ -0,0 +1,16 @@
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
18 changes: 18 additions & 0 deletions spec/acceptance/nodesets/ubuntu-14.04.yml
@@ -0,0 +1,18 @@
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
18 changes: 18 additions & 0 deletions spec/acceptance/nodesets/ubuntu-14.10.yml
@@ -0,0 +1,18 @@
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
16 changes: 16 additions & 0 deletions spec/acceptance/nodesets/ubuntu-15.04.yml
@@ -0,0 +1,16 @@
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
16 changes: 16 additions & 0 deletions spec/acceptance/nodesets/ubuntu-15.10.yml
@@ -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: aio
log_level: debug
16 changes: 16 additions & 0 deletions spec/acceptance/nodesets/ubuntu-16.04.yml
@@ -0,0 +1,16 @@
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 comments on commit f5048ab

Please sign in to comment.