From 21efbdaa24cf5000266227f35ca209fa90052779 Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 6 May 2015 14:30:28 -0700
Subject: [PATCH 1/2] sync via modulesync

---
 .travis.yml | 10 ----------
 Gemfile     |  9 +++------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d1a0d7cd9..ecf7d9076 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,23 +6,13 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.4.0"
   - rvm: 1.8.7
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 1.9.3
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.5
     env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.1.5
-    env: PUPPET_GEM_VERSION="~> 3.4.0"
   - rvm: 2.1.5
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
 notifications:
   email: false
diff --git a/Gemfile b/Gemfile
index fcd27d534..fb7202c83 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,13 +18,8 @@ group :development, :unit_tests do
   gem 'json',                    :require => false
 end
 
-beaker_version = ENV['BEAKER_VERSION']
-beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
 group :system_tests do
-  if beaker_version
-    gem 'beaker', *location_for(beaker_version)
-  end
-  if beaker_rspec_version
+  if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else
     gem 'beaker-rspec',  :require => false
@@ -32,6 +27,8 @@ group :system_tests do
   gem 'serverspec',    :require => false
 end
 
+
+
 if facterversion = ENV['FACTER_GEM_VERSION']
   gem 'facter', facterversion, :require => false
 else

From a80726f24fd03736fcbb934a4a1af960ae5c65eb Mon Sep 17 00:00:00 2001
From: Morgan Haskel <morgan@puppetlabs.com>
Date: Wed, 6 May 2015 14:32:17 -0700
Subject: [PATCH 2/2] beaker gemfile fixes

---
 Gemfile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index fb7202c83..2b1b7cd8d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -19,6 +19,9 @@ group :development, :unit_tests do
 end
 
 group :system_tests do
+  if beaker_version = ENV['BEAKER_VERSION']
+    gem 'beaker', *location_for(beaker_version)
+  end
   if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
     gem 'beaker-rspec', *location_for(beaker_rspec_version)
   else