Merge pull request #180 from solarkennedy/more_beaker

Update beaker tests + travis integration
voxpupuli · Sep 5, 2015 · 3d503f4 · 3d503f4
2 parents 8cd0af1 + 88bb33c
commit 3d503f4
Show file tree

Hide file tree

Showing 10 changed files with 85 additions and 77 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,20 +2,19 @@
 language: ruby
 bundler_args: --without development
 before_install: rm Gemfile.lock || true
-sudo: false
+sudo: true
 rvm:
-#  - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.0
-script: bundle exec rake test
+script: if [[ $BEAKER == true ]]; then make beaker; else bundle exec rake test; fi
 env:
-#  - PUPPET_VERSION="~> 2.7.0"
   - PUPPET_VERSION="~> 3.1.0"
   - PUPPET_VERSION="~> 3.3.0"
   - PUPPET_VERSION="~> 3.7.4" FUTURE_PARSER=yes STRICT_VARIABLES=yes
   - PUPPET_VERSION="~> 4.0.0"
   - PUPPET_VERSION="~> 4.1.0"
+  - BEAKER=true
 matrix:
   exclude:
   - rvm: 1.9.3
@@ -42,3 +41,7 @@ matrix:
     env: PUPPET_VERSION="~> 4.1.0"
   - rvm: 2.0.0
     env: PUPPET_VERSION="~> 4.1.0"
+  - rvm: 1.9.3
+    env: BEAKER=true
+  - rvm: 2.0.0
+    env: BEAKER=true
diff --git a/Gemfile b/Gemfile
@@ -3,6 +3,7 @@ source "https://rubygems.org"
 group :development do
   gem "beaker", "> 2.0.0"
   gem "beaker-rspec", ">= 5.1.0"
+  gem "beaker-puppet_install_helper"
   gem "pry"
   gem "puppet-blacksmith"
   gem "serverspec"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.2.8)
-    activesupport (4.2.1)
+    CFPropertyList (2.3.1)
+    activesupport (4.2.4)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -13,13 +13,14 @@ GEM
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
       multi_json (>= 1.0.0)
-    aws-sdk (1.64.0)
-      aws-sdk-v1 (= 1.64.0)
-    aws-sdk-v1 (1.64.0)
+    aws-sdk (1.65.0)
+      aws-sdk-v1 (= 1.65.0)
+    aws-sdk-v1 (1.65.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    beaker (2.14.1)
+    beaker (2.20.0)
       aws-sdk (~> 1.57)
+      beaker-answers (~> 0.0)
       docker-api
       fission (~> 0.4)
       fog (~> 1.25)
@@ -30,36 +31,43 @@ GEM
       minitest (~> 5.4)
       net-scp (~> 1.2)
       net-ssh (~> 2.9)
+      open_uri_redirections (~> 0.2.1)
       rbvmomi (~> 1.8)
       rsync (~> 1.0.9)
+      stringify-hash (~> 0.0)
       unf (~> 0.1)
-    beaker-rspec (5.1.0)
+    beaker-answers (0.0.0)
+      require_all (~> 1.3.2)
+      stringify-hash (~> 0.0.0)
+    beaker-puppet_install_helper (0.3.1)
+      beaker (~> 2.0)
+    beaker-rspec (5.2.0)
       beaker (~> 2.0)
       rspec
       serverspec (~> 2)
       specinfra (~> 2)
     builder (3.2.2)
     coderay (1.1.0)
     diff-lcs (1.2.5)
-    docker-api (1.21.4)
+    docker-api (1.22.2)
       excon (>= 0.38.0)
       json
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
-    excon (0.45.3)
+    excon (0.45.4)
     extlib (0.9.16)
-    facter (2.4.4)
-      CFPropertyList (~> 2.2.6)
+    facter (1.7.6)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.31.0)
+    fog (1.33.0)
       fog-atmos
-      fog-aws (~> 0.0)
+      fog-aws (>= 0.6.0)
       fog-brightbox (~> 0.4)
-      fog-core (~> 1.30)
-      fog-ecloud
+      fog-core (~> 1.32)
+      fog-dynect
+      fog-ecloud (= 0.1.1)
       fog-google (>= 0.0.2)
       fog-json
       fog-local
@@ -80,26 +88,30 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.4.0)
+    fog-aws (0.7.5)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-brightbox (0.7.1)
+    fog-brightbox (0.9.0)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.30.0)
+    fog-core (1.32.1)
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-    fog-ecloud (0.1.2)
+    fog-dynect (0.0.2)
+      fog-core
+      fog-json
+      fog-xml
+    fog-ecloud (0.1.1)
       fog-core
       fog-xml
-    fog-google (0.0.5)
+    fog-google (0.0.7)
       fog-core
       fog-json
       fog-xml
@@ -112,7 +124,7 @@ GEM
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
-    fog-profitbricks (0.0.3)
+    fog-profitbricks (0.0.5)
       fog-core
       fog-xml
       nokogiri
@@ -130,7 +142,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (0.4.6)
+    fog-softlayer (0.4.7)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -160,16 +172,17 @@ GEM
       multi_json (~> 1.10)
       retriable (~> 1.4)
       signet (~> 0.6)
-    googleauth (0.4.1)
+    googleauth (0.4.2)
       faraday (~> 0.9)
       jwt (~> 1.4)
       logging (~> 2.0)
       memoist (~> 0.12)
-      multi_json (= 1.11)
+      multi_json (~> 1.11)
       signet (~> 0.6)
     hiera (1.3.4)
       json_pure
-    hocon (0.9.0)
+    hiera-puppet-helper (1.0.1)
+    hocon (0.9.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
@@ -178,7 +191,7 @@ GEM
     ipaddress (0.8.0)
     json (1.8.3)
     json_pure (1.8.2)
-    jwt (1.5.0)
+    jwt (1.5.1)
     launchy (2.4.3)
       addressable (~> 2.3)
     little-plugger (1.1.3)
@@ -190,17 +203,19 @@ GEM
     method_source (0.8.2)
     mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.11.0)
+    multi_json (1.11.2)
     multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
+    net-telnet (0.1.1)
     netrc (0.10.3)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    open_uri_redirections (0.2.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -226,6 +241,7 @@ GEM
       builder
       nokogiri (>= 1.4.1)
       trollop
+    require_all (1.3.2)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -249,36 +265,44 @@ GEM
       rspec
     rspec-support (3.1.2)
     rsync (1.0.9)
-    serverspec (2.17.1)
+    serverspec (2.22.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.32)
+      specinfra (~> 2.42)
+    sfl (2.2)
     signet (0.6.1)
       addressable (~> 2.3)
       extlib (~> 0.9)
       faraday (~> 0.9)
       jwt (~> 1.5)
       multi_json (~> 1.10)
     slop (3.6.0)
-    specinfra (2.34.9)
+    specinfra (2.42.0)
       net-scp
-      net-ssh
+      net-ssh (~> 2.7)
+      net-telnet
+      sfl
+    stringify-hash (0.0.2)
     thread_safe (0.3.5)
     trollop (2.1.2)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
-    vagrant-wrapper (2.0.2)
+    vagrant-wrapper (2.0.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   beaker (> 2.0.0)
+  beaker-puppet_install_helper
   beaker-rspec (>= 5.1.0)
+  hiera
+  hiera-puppet-helper
+  json
   pry
   puppet (~> 3.7.0)
   puppet-blacksmith

diff --git a/Makefile b/Makefile
@@ -0,0 +1,8 @@
+# Make target for TravisCI to run beaker tests in docker
+beaker:
+	bundle config
+	rm .bundle/config
+	bundle config
+	bundle install
+	curl -sLo - http://j.mp/install-travis-docker | UML_DOCKERCOMPOSE=0 UML_FIG=0 sh -e
+	./run 'bundle exec rake beaker'
diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
@@ -3,5 +3,7 @@ HOSTS:
     platform: ubuntu-12.04-x64
     image: solarkennedy/ubuntu-12.04-puppet
     hypervisor: docker
+    docker_cmd: '["/sbin/init"]' 
+    docker_preserve_image: true
 CONFIG: 
   type: foss
diff --git a/spec/acceptance/standard_spec.rb b/spec/acceptance/standard_spec.rb
@@ -7,6 +7,7 @@
     it 'should work with no errors based on the example' do
       pp = <<-EOS
         class { 'consul':
+          version     => '0.5.2',
           config_hash => {
               'datacenter' => 'east-aws',
               'data_dir'   => '/opt/consul',
@@ -31,7 +32,7 @@ class { 'consul':
     end
 
     describe command('consul version') do
-      it { should return_stdout /Consul v0\.4\.1/ }
+      its(:stdout) { should match /Consul v0\.5\.2/ }
     end
 
   end

diff --git a/spec/acceptance/ui_spec.rb b/spec/acceptance/ui_spec.rb
@@ -7,6 +7,7 @@
     it 'should work with no errors based on the UI example' do
       pp = <<-EOS
         class { 'consul':
+          version     => '0.5.2',
           config_hash => {
             'datacenter'  => 'east-aws',
             'data_dir'    => '/opt/consul',
@@ -29,17 +30,15 @@ class { 'consul':
     end
 
     describe file('/opt/consul/ui') do
-      it { should be_linked_to '/opt/consul/0.4.1_web_ui' }
+      it { should be_linked_to '/opt/consul/0.5.2_web_ui' }
     end
 
     describe service('consul') do
       it { should be_enabled }
     end
 
-    it { should contain_service('mysql-server').with_ensure('present') }
-
     describe command('consul version') do
-      it { should return_stdout /Consul v0\.4\.1/ }
+      its(:stdout) { should match /Consul v0\.5\.2/ }
     end
 
   end

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -1,10 +1,9 @@
-require 'beaker-rspec'
+require 'beaker-rspec/spec_helper'
+require 'beaker-rspec/helpers/serverspec'
+require 'beaker/puppet_install_helper'
+
+run_puppet_install_helper unless ENV['BEAKER_provision'] == 'no'
 
-#hosts.each do |host|
-#  # Install Puppet
-#  install_puppet
-#end
-#
 RSpec.configure do |c|
   # Project root
   proj_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))

diff --git a/spec/spec_helper_system.rb b/spec/spec_helper_system.rb
diff --git a/spec/system/basic_spec.rb b/spec/system/basic_spec.rb