.gitignore

@@ -5,3 +5,6 @@ spec/fixtures/
 .vagrant/
 .bundle/
 coverage/
+log/
+.*.swp
+*~

.travis.yml

@@ -15,7 +15,7 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.0
+  - rvm: 2.1.6
     env: PUPPET_GEM_VERSION="~> 4.0"
 notifications:
   email: false

CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2015-08-21 - Release 0.2.1
+
+Use docker for acceptance tests
+
 # Change Log
 
 ## [0.2.0](https://forge.puppetlabs.com/Camptocamp/systemd/0.2.0) (2015-08-05)
@@ -42,4 +46,4 @@
 - Confine rspec pinning to ruby 1.8
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

Gemfile

@@ -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'
-  gem 'puppet-blacksmith',                                 :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/
 end
 
 group :system_tests do

Rakefile

@@ -1,8 +1,5 @@
 require 'puppetlabs_spec_helper/rake_tasks'
 require 'puppet-lint/tasks/puppet-lint'
-require 'github_changelog_generator/task'
-require 'puppet_blacksmith'
-require 'puppet_blacksmith/rake_tasks'
 
 Rake::Task[:lint].clear
 PuppetLint::RakeTask.new :lint do |config|
@@ -13,8 +10,14 @@ end
 
 PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"]
 
-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"
+# Publishing tasks
+unless RUBY_VERSION =~ /^1\.8/
+  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
 end

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "camptocamp-systemd",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "author": "Camptocamp",
   "summary": "Puppet Systemd module",
   "license": "Apache-2.0",

spec/acceptance/nodesets/centos-5-x86_64-docker.yml

@@ -6,8 +6,10 @@ HOSTS:
     platform: el-5-x86_64
     hypervisor : docker
     image: centos:5
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'yum install -y crontabs tar wget'
 CONFIG:
   type: foss
   log_level: debug

spec/acceptance/nodesets/centos-6-x86_64-docker.yml

@@ -6,8 +6,10 @@ HOSTS:
     platform: el-6-x86_64
     hypervisor : docker
     image: centos:6
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'yum install -y crontabs tar wget'
 CONFIG:
   type: foss
   log_level: debug

spec/acceptance/nodesets/centos-7-x86_64-docker.yml

@@ -6,8 +6,10 @@ HOSTS:
     platform: el-7-x86_64
     hypervisor : docker
     image: centos:7
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/usr/sbin/init"]'
+    docker_image_commands:
+      - 'yum install -y crontabs tar wget'
 CONFIG:
   type: foss
   log_level: debug

spec/acceptance/nodesets/debian-6-x86_64-docker.yml

@@ -6,8 +6,10 @@ HOSTS:
     platform: debian-6-amd64
     hypervisor : docker
     image: debian:6
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y wget'
 CONFIG:
   type: foss
   log_level: debug

spec/acceptance/nodesets/debian-7-x86_64-docker.yml

@@ -6,8 +6,10 @@ HOSTS:
     platform: debian-7-amd64
     hypervisor : docker
     image: debian:7
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y cron wget'
 CONFIG:
   type: foss
   log_level: debug

spec/acceptance/nodesets/debian-8-x86_64-docker.yml

@@ -6,8 +6,10 @@ HOSTS:
     platform: debian-8-amd64
     hypervisor : docker
     image: debian:8
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y cron wget'
 CONFIG:
   type: foss
   log_level: debug

spec/acceptance/nodesets/ubuntu-12.04-x86_64-docker.yml

@@ -6,8 +6,10 @@ HOSTS:
     platform: ubuntu-12.04-amd64
     hypervisor : docker
     image: ubuntu:12.04
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y wget'
 CONFIG:
   type: foss
   log_level: debug

spec/acceptance/nodesets/ubuntu-14.04-x86_64-docker.yml

@@ -6,8 +6,10 @@ HOSTS:
     platform: ubuntu-14.04-amd64
     hypervisor : docker
     image: ubuntu:14.04
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y wget'
 CONFIG:
   type: foss
   log_level: debug

spec/acceptance/nodesets/ubuntu-14.10-x86_64-docker.yml

@@ -6,8 +6,10 @@ HOSTS:
     platform: ubuntu-14.10-amd64
     hypervisor : docker
     image: ubuntu:14.10
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y wget'
 CONFIG:
   type: foss
   log_level: debug

spec/acceptance/nodesets/ubuntu-15.04-x86_64-docker.yml

@@ -6,8 +6,10 @@ HOSTS:
     platform: ubuntu-15.04-amd64
     hypervisor : docker
     image: ubuntu:15.04
-    # This stops the image from being deleted on completion, speeding up the process.
     docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -y wget'
 CONFIG:
   type: foss
   log_level: debug