diff --git a/.travis.yml b/.travis.yml index c19b06b8..78ebaf7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,31 +10,29 @@ before_install: - gem update bundler - gem --version - bundle -v -after_install: - - bundle exec gem list script: - 'bundle exec rake $CHECK' matrix: fast_finish: true include: - rvm: 1.9.3 - env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test + env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test SYSTEM_TESTS="no" - rvm: 1.9.3 - env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test + env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" FUTURE_PARSER="yes" CHECK=test SYSTEM_TESTS="no" - rvm: 2.1.9 - env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test + env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" CHECK=test SYSTEM_TESTS="no" - rvm: 2.1.9 - env: PUPPET_VERSION="~> 4.0" CHECK=test + env: PUPPET_VERSION="~> 4.0" CHECK=test SYSTEM_TESTS="no" - rvm: 2.2.6 - env: PUPPET_VERSION="~> 4.0" CHECK=test + env: PUPPET_VERSION="~> 4.0" CHECK=test SYSTEM_TESTS="no" - rvm: 2.3.3 - env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes + env: PUPPET_VERSION="~> 4.0" CHECK=build DEPLOY_TO_FORGE=yes SYSTEM_TESTS="no" - rvm: 2.3.3 - env: PUPPET_VERSION="~> 4.0" CHECK=rubocop + env: PUPPET_VERSION="~> 4.0" CHECK=rubocop SYSTEM_TESTS="no" - rvm: 2.3.3 - env: PUPPET_VERSION="~> 4.0" CHECK=test + env: PUPPET_VERSION="~> 4.0" CHECK=test SYSTEM_TESTS="no" - rvm: 2.4.0 - env: PUPPET_VERSION="~> 4.0" CHECK=test + env: PUPPET_VERSION="~> 4.0" CHECK=test SYSTEM_TESTS="no" allow_failures: - rvm: 2.4.0 branches: diff --git a/Gemfile b/Gemfile index 46a0f90c..a397366b 100644 --- a/Gemfile +++ b/Gemfile @@ -42,7 +42,7 @@ group :development do end group :system_tests do - if RUBY_VERSION >= '2.0.0' + if ENV['SYSTEM_TESTS'] == 'yes' if beaker_version = ENV['BEAKER_VERSION'] gem 'beaker', *location_for(beaker_version) end