Merge pull request #275 from pdxcat/test_puppet4

Add puppet4 to .travis and update ruby to 2.1.6
redhat-openstack · Jun 17, 2015 · 4b569da · 4b569da
2 parents b9b1cc1 + ea331d6
commit 4b569da
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 56 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,21 +2,21 @@
 sudo: false
 language: ruby
 bundler_args: --without system_tests
-script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
+script:
+  - 'puppet --version'
+  - 'bundle exec rake validate'
+  - 'bundle exec rake lint'
+  - "bundle exec rake spec SPEC_OPTS='--format documentation'"
 matrix:
   fast_finish: true
   include:
   - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
-  - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.5.0" STRICT_VARIABLES="yes"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.7.5" STRICT_VARIABLES="yes"
-  - rvm: 2.0.0
+  - rvm: 2.1.6
     env: PUPPET_GEM_VERSION="~> 3.7.5" STRICT_VARIABLES="yes"
+  - rvm: 2.1.6
+    env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
 notifications:
   email: false
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,8 +1,8 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.1)
-    activesupport (4.2.1)
+    CFPropertyList (2.2.8)
+    activesupport (4.2.2)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -18,13 +18,13 @@ GEM
     aws-sdk-v1 (1.64.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
-    beaker (2.10.0)
+    beaker (2.14.1)
       aws-sdk (~> 1.57)
       docker-api
       fission (~> 0.4)
       fog (~> 1.25)
       google-api-client (~> 0.8)
-      hocon (~> 0.0.4)
+      hocon (~> 0.1)
       inifile (~> 2.0)
       json (~> 1.8)
       minitest (~> 5.4)
@@ -33,30 +33,32 @@ GEM
       rbvmomi (~> 1.8)
       rsync (~> 1.0.9)
       unf (~> 0.1)
-    beaker-rspec (5.0.2)
+    beaker-rspec (5.1.0)
       beaker (~> 2.0)
       rspec
       serverspec (~> 2)
       specinfra (~> 2)
     builder (3.2.2)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    docker-api (1.21.1)
+    docker-api (1.21.4)
       excon (>= 0.38.0)
       json
     excon (0.45.3)
     extlib (0.9.16)
-    facter (1.7.6)
+    facter (2.4.4)
+      CFPropertyList (~> 2.2.6)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    fog (1.29.0)
+    fog (1.31.0)
       fog-atmos
       fog-aws (~> 0.0)
       fog-brightbox (~> 0.4)
-      fog-core (~> 1.27, >= 1.27.4)
+      fog-core (~> 1.30)
       fog-ecloud
+      fog-google (>= 0.0.2)
       fog-json
       fog-local
       fog-powerdns (>= 0.1.1)
@@ -76,7 +78,7 @@ GEM
     fog-atmos (0.1.0)
       fog-core
       fog-xml
-    fog-aws (0.1.2)
+    fog-aws (0.4.1)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
@@ -92,19 +94,23 @@ GEM
       mime-types
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-    fog-ecloud (0.1.1)
+    fog-ecloud (0.1.3)
       fog-core
       fog-xml
-    fog-json (1.0.1)
+    fog-google (0.0.5)
+      fog-core
+      fog-json
+      fog-xml
+    fog-json (1.0.2)
       fog-core (~> 1.0)
-      multi_json (~> 1.0)
+      multi_json (~> 1.10)
     fog-local (0.2.1)
       fog-core (~> 1.27)
     fog-powerdns (0.1.1)
       fog-core (~> 1.27)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
-    fog-profitbricks (0.0.2)
+    fog-profitbricks (0.0.3)
       fog-core
       fog-xml
       nokogiri
@@ -122,7 +128,7 @@ GEM
     fog-serverlove (0.1.2)
       fog-core
       fog-json
-    fog-softlayer (0.4.5)
+    fog-softlayer (0.4.6)
       fog-core
       fog-json
     fog-storm_on_demand (0.1.1)
@@ -152,37 +158,37 @@ GEM
       multi_json (~> 1.10)
       retriable (~> 1.4)
       signet (~> 0.6)
-    googleauth (0.4.0)
+    googleauth (0.4.1)
       faraday (~> 0.9)
       jwt (~> 1.4)
-      logging (~> 1.8)
-      memoist (~> 0.11)
+      logging (~> 2.0)
+      memoist (~> 0.12)
       multi_json (= 1.11)
       signet (~> 0.6)
-    hiera (1.3.4)
+    hiera (2.0.0)
       json_pure
-    hocon (0.0.7)
+    hocon (0.9.0)
     i18n (0.7.0)
     inflecto (0.0.2)
     inifile (2.0.2)
     ipaddress (0.8.0)
-    json (1.8.2)
+    json (1.8.3)
     json_pure (1.8.2)
-    jwt (1.4.1)
+    jwt (1.5.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     little-plugger (1.1.3)
-    logging (1.8.2)
-      little-plugger (>= 1.1.3)
-      multi_json (>= 1.8.4)
+    logging (2.0.0)
+      little-plugger (~> 1.1)
+      multi_json (~> 1.10)
     memoist (0.12.0)
     metaclass (0.0.4)
     metadata-json-lint (0.0.6)
       json
       spdx-licenses (~> 1.0)
-    mime-types (2.4.3)
+    mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.6.0)
+    minitest (5.7.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
     multi_json (1.11.0)
@@ -192,15 +198,15 @@ GEM
     net-ssh (2.9.2)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
-    puppet (3.7.5)
-      facter (> 1.6, < 3)
-      hiera (~> 1.0)
+    puppet (4.1.0)
+      facter (> 2.0, < 4)
+      hiera (>= 2.0, < 3)
       json_pure
     puppet-lint (1.1.0)
     puppet-syntax (2.0.0)
       rake
     puppet_facts (0.2.1)
-    puppetlabs_spec_helper (0.10.2)
+    puppetlabs_spec_helper (0.10.3)
       mocha
       puppet-lint
       puppet-syntax
@@ -212,35 +218,35 @@ GEM
       nokogiri (>= 1.4.1)
       trollop
     retriable (1.4.1)
-    rspec (3.2.0)
-      rspec-core (~> 3.2.0)
-      rspec-expectations (~> 3.2.0)
-      rspec-mocks (~> 3.2.0)
-    rspec-core (3.2.3)
-      rspec-support (~> 3.2.0)
-    rspec-expectations (3.2.1)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.0)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
+      rspec-support (~> 3.3.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.2.1)
+    rspec-mocks (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.2.0)
-    rspec-puppet (2.1.0)
+      rspec-support (~> 3.3.0)
+    rspec-puppet (2.2.0)
       rspec
-    rspec-support (3.2.2)
+    rspec-support (3.3.0)
     rsync (1.0.9)
-    serverspec (2.14.1)
+    serverspec (2.18.0)
       multi_json
       rspec (~> 3.0)
       rspec-its
-      specinfra (~> 2.25)
-    signet (0.6.0)
+      specinfra (~> 2.35)
+    signet (0.6.1)
       addressable (~> 2.3)
       extlib (~> 0.9)
       faraday (~> 0.9)
-      jwt (~> 1.0)
+      jwt (~> 1.5)
       multi_json (~> 1.10)
     simplecov (0.10.0)
       docile (~> 1.1.0)
@@ -249,7 +255,7 @@ GEM
     simplecov-html (0.10.0)
     spdx-licenses (1.0.0)
       json
-    specinfra (2.30.0)
+    specinfra (2.36.0)
       net-scp
       net-ssh
     thread_safe (0.3.5)
@@ -276,3 +282,6 @@ DEPENDENCIES
   rspec-puppet
   serverspec
   simplecov
+
+BUNDLED WITH
+   1.10.3