Merge pull request jhoblitt#24 from jhoblitt/plumbing/update

update build/test plumbing

Author: jhoblitt

.travis.yml

@@ -1,17 +1,26 @@
 sudo: false
 language: ruby
-bundler_args: --without beaker
+bundler_args: --without release beaker
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
+  - '2.0'
+  - '2.1'
+  - '2.2'
 env:
   - PUPPET_GEM_VERSION="~> 3.7"
-  - PUPPET_GEM_VERSION="~> 4.0"
+  - PUPPET_GEM_VERSION="~> 4.9"
 matrix:
+  include:
+    - rvm: '2.2'
+      sudo: required
+      services: docker
+      env: BEAKER_set="centos-7-docker"
+      script: travis_retry bundle exec rake beaker
+      bundler_args: --without release
   exclude:
-    - rvm: 2.2
+    - rvm: '2.2'
       env: PUPPET_GEM_VERSION="~> 3.7"
+    - rvm: '2.0'
+      env: PUPPET_GEM_VERSION="~> 4.9"
   fast_finish: true
 notifications:
   email: false

Gemfile

@@ -1,35 +1,22 @@
 source 'https://rubygems.org'
 
-if puppetversion = ENV['PUPPET_GEM_VERSION']
-  gem 'puppet', puppetversion, :require => false
-else
-  gem 'puppet', :require => false
-end
-
-if facterversion = ENV['FACTER_GEM_VERSION']
-  gem 'facter', facterversion, :require => false
-else
-  gem 'facter', :require => false
-end
+gem 'metadata-json-lint',                            :require => false
+gem 'puppet', ENV['PUPPET_GEM_VERSION'] || '~> 4.9', :require => false
+gem 'puppetlabs_spec_helper', '~> 1.2',              :require => false
+gem 'puppet-lint', '~> 2.0',                         :require => false
+gem 'puppet-syntax',                                 :require => false
+gem 'rake',                                          :require => false
+gem 'rspec-puppet', '~> 2.5.0',                      :require => false
+gem 'travis', '~> 1.8',                              :require => false
 
-group :development, :test do
-  gem 'rake',                     :require => false
-  # https://github.com/rspec/rspec-core/issues/1864
-  gem 'rspec', '< 3.2.0', {"platforms"=>["ruby_18"]}
-  gem 'puppetlabs_spec_helper',   :require => false
-  gem 'puppet-lint', '>= 1.1.0',  :require => false
-  gem 'puppet-syntax',            :require => false
-  gem 'rspec-puppet', '~> 2.1.0', :require => false
-  gem 'metadata-json-lint',       :require => false
+group :release do
+  gem 'puppet-blacksmith', :require => false
 end
 
 group :beaker do
-  gem 'serverspec',               :require => false
-  gem 'beaker', '<= 2.26.0',      :require => false
-  gem 'beaker-rspec',             :require => false
-  gem 'pry',                      :require => false
-  gem 'travis-lint',              :require => false
-  gem 'puppet-blacksmith',        :require => false
+  gem 'beaker-puppet_install_helper', :require => false
+  gem 'beaker-rspec', '~> 6.0.0',     :require => false
+  gem 'serverspec',                   :require => false
 end
 
 # vim:ft=ruby

Rakefile

@@ -1,6 +1,4 @@
 require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet-syntax/tasks/puppet-syntax'
-require 'puppet-lint/tasks/puppet-lint'
 
 begin
   require 'puppet_blacksmith/rake_tasks'
@@ -17,8 +15,16 @@ PuppetLint::RakeTask.new :lint do |config|
   config.fail_on_warnings = true
 end
 
-task :travis_lint do
-  sh "travis-lint"
+namespace :travis do
+  desc 'Syntax check travis.yml'
+  task :lint do
+    sh "travis lint --exit-code --skip-completion-check" do |ok, res|
+      unless ok
+        # exit without verbose rake error message
+        exit res.exitstatus
+      end
+    end
+  end
 end
 
 task :default => [

spec/acceptance/nodesets/centos-5.11.yml

@@ -0,0 +1,14 @@
+HOSTS:
+  centos-6-x64:
+    platform: el-6-x86_64
+    hypervisor : docker
+    image: centos:6
+    docker_preserve_image: true
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'yum install -y crontabs tar wget'
+    default_apply_opts:
+      disable_warnings: deprecations
+CONFIG:
+  type: foss
+  log_level: debug

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

@@ -0,0 +1,29 @@
+FROM centos:7
+ENV container docker
+
+# beaker default behavior
+RUN yum clean all
+RUN yum install -y sudo openssh-server openssh-clients curl ntpdate
+RUN ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
+RUN ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key
+RUN mkdir -p /var/run/sshd
+RUN echo root:root | chpasswd
+RUN sed -ri 's/^#?PermitRootLogin .*/PermitRootLogin yes/' /etc/ssh/sshd_config
+RUN sed -ri 's/^#?PasswordAuthentication .*/PasswordAuthentication yes/' /etc/ssh/sshd_config
+RUN yum install -y crontabs tar wget
+EXPOSE 22
+
+# based on https://github.com/slafs/dockerfiles/blob/master/centos7-systemd/Dockerfile
+RUN yum -y swap -- remove fakesystemd -- install systemd systemd-libs
+RUN systemctl mask dev-mqueue.mount dev-hugepages.mount \
+    systemd-remount-fs.service sys-kernel-config.mount \
+    sys-kernel-debug.mount sys-fs-fuse-connections.mount \
+    display-manager.service systemd-logind.service
+RUN systemctl disable graphical.target; systemctl enable multi-user.target
+RUN systemctl enable sshd.service
+VOLUME ["/sys/fs/cgroup"]
+
+# provides /usr/sbin/service required by the service redhat provider
+RUN yum install -y initscripts
+
+CMD  ["/usr/lib/systemd/systemd"]

spec/acceptance/nodesets/centos-6.6.yml

@@ -0,0 +1,11 @@
+HOSTS:
+  centos-7-x64:
+    platform: el-7-x86_64
+    hypervisor : docker
+    docker_preserve_image: true
+    dockerfile: spec/acceptance/nodesets/centos-7-docker.Dockerfile
+    default_apply_opts:
+      disable_warnings: deprecations
+CONFIG:
+  type: foss
+  log_level: debug