(MODULES-4097) Sync travis.yml

diff --git a/.travis.yml b/.travis.yml
index 00e21af1cf15fc7c86816303fdd864870a9c89a5..115691d393be4b1af98560703842c6a9a2cc9937 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@
 sudo: false
 language: ruby
 cache: bundler
-script: "bundle exec rake validate lint spec"
+script: "bundle exec rake release_checks"
 #Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
 before_install:
   - gem update bundler
@@ -25,17 +25,8 @@ matrix:
   - rvm: 2.3.1
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 4.0"
-  - rvm: 2.1.9
+  - rvm: 2.1.7
     bundler_args: --without system_tests
     env: PUPPET_GEM_VERSION="~> 4.0"
-  - rvm: 2.1.5
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
-  - rvm: 2.1.5
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    bundler_args: --without system_tests
-    env: PUPPET_GEM_VERSION="~> 3.0"
 notifications:
   email: false

diff --git a/Gemfile b/Gemfile
index 3d46720d2fad1525beba321b55bc3ff8c488ed27..5820775a362b1dcdba4e45288a8597be2f53c199 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -59,6 +59,7 @@ group :system_tests do
   gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '>= 3.4')     if ! supports_windows
   gem 'beaker-rspec', *location_for(ENV['BEAKER_RSPEC_VERSION'] || '~> 5.1')     if supports_windows
   gem 'beaker-puppet_install_helper',                                            :require => false
+  gem 'beaker-module_install_helper',                                            :require => false
   gem 'master_manipulator',                                                      :require => false
   gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
   gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')