Bundler Args for MRI 2.0, Puppet version 3.8.7 for beaker

coi-gov-pl · Jan 25, 2017 · ab2ff56 · ab2ff56
1 parent ee88404
commit ab2ff56
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -33,24 +33,25 @@ matrix:
   - rvm: '2.0'
     env: PUPPET_VERSION="~> 3.0"
     gemfile: gemfiles/Gemfile20
+    bundler_args: "--without development --jobs=3 --retry=3 --path=${BUNDLE_PATH:-../vendor/bundle}"
   - rvm: '2.1'
     env: PUPPET_VERSION="~> 3.0"
   - rvm: '2.1'
     env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES=yes
   - rvm: '2.1'
     sudo: required
     services: docker
-    env: PUPPET_VERSION="3.8.5" RS_SET="centos-6-x86_64-docker"
+    env: PUPPET_VERSION="3.8.7" RS_SET="centos-6-x86_64-docker"
     script: bundle exec rake acceptance
   - rvm: '2.1'
     sudo: required
     services: docker
-    env: PUPPET_VERSION="3.8.5" RS_SET="debian-7-x86_64-docker"
+    env: PUPPET_VERSION="3.8.7" RS_SET="debian-7-x86_64-docker"
     script: bundle exec rake acceptance
   - rvm: '2.1'
     sudo: required
     services: docker
-    env: PUPPET_VERSION="3.8.5" RS_SET="ubuntu-14.04-x86_64-docker"
+    env: PUPPET_VERSION="3.8.7" RS_SET="ubuntu-14.04-x86_64-docker"
     script: bundle exec rake acceptance
   # FIXME: GH Issue #3 - Activate acceptance tests on Travis CI for Puppet Enterprise, at least 2.8.8 and 3.8.2
 notifications:

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -14,7 +14,7 @@
   if default.is_pe?
     install_pe
   else
-    install_puppet foss_opts
+    install_puppet_on(hosts, foss_opts)
   end
 
   hosts.each do |host|