mirror of
https://github.com/inspec/inspec
synced 2024-11-10 07:04:15 +00:00
Fixing Travis tests due to rvm/bundle issues (#2421)
Signed-off-by: Adam Leff <adam@leff.co>
This commit is contained in:
parent
1cd7e1a120
commit
ff5dbb79cb
2 changed files with 11 additions and 9 deletions
18
.travis.yml
18
.travis.yml
|
@ -10,8 +10,10 @@ services:
|
|||
bundler_args: "--without integration tools maintenance deploy"
|
||||
before_install:
|
||||
- gem update --system
|
||||
- gem update bundler
|
||||
- gem --version
|
||||
- rvm @global do gem uninstall bundler -a -x
|
||||
- rvm @global do gem install bundler
|
||||
- bundle --version
|
||||
matrix:
|
||||
include:
|
||||
- rvm: 2.3.5
|
||||
|
@ -20,32 +22,32 @@ matrix:
|
|||
script: bundle exec rake $SUITE
|
||||
env: SUITE="test:functional"
|
||||
- rvm: 2.4.2
|
||||
bundler_args: "--without guard tools"
|
||||
script: bundle exec rake $SUITE
|
||||
bundler_args: "--without tools maintenance deploy"
|
||||
env: SUITE=test:integration OS=default-ubuntu-1204 DOCKER=true
|
||||
- rvm: 2.4.2
|
||||
bundler_args: "--without guard tools"
|
||||
script: bundle exec rake $SUITE
|
||||
bundler_args: "--without tools maintenance deploy"
|
||||
env: SUITE=test:integration OS='default-ubuntu-1604' DOCKER=true
|
||||
- rvm: 2.4.2
|
||||
bundler_args: "--without guard tools"
|
||||
script: bundle exec rake $SUITE
|
||||
bundler_args: "--without tools maintenance deploy"
|
||||
env: SUITE=test:integration OS='default-centos-68' DOCKER=true
|
||||
- rvm: 2.4.2
|
||||
bundler_args: "--without guard tools"
|
||||
script: bundle exec rake $SUITE
|
||||
bundler_args: "--without tools maintenance deploy"
|
||||
env: SUITE=test:integration OS='default-centos-7' DOCKER=true
|
||||
- rvm: 2.4.2
|
||||
bundler_args: "--without guard tools"
|
||||
script: bundle exec rake $SUITE
|
||||
bundler_args: "--without tools maintenance deploy"
|
||||
env: SUITE=test:integration OS='default-debian-8' DOCKER=true
|
||||
- rvm: 2.4.2
|
||||
bundler_args: "--without guard tools"
|
||||
script: bundle exec rake $SUITE
|
||||
bundler_args: "--without tools maintenance deploy"
|
||||
env: SUITE=test:integration OS='default-oracle-72' DOCKER=true
|
||||
- rvm: 2.4.2
|
||||
bundler_args: "--without guard tools"
|
||||
script: bundle exec rake $SUITE
|
||||
bundler_args: "--without tools maintenance deploy"
|
||||
env: SUITE=test:integration OS='default-fedora-24' DOCKER=true
|
||||
- rvm: 2.4.2
|
||||
sudo: false
|
||||
|
|
2
Rakefile
2
Rakefile
|
@ -68,7 +68,7 @@ namespace :test do
|
|||
task :integration do
|
||||
concurrency = ENV['CONCURRENCY'] || 1
|
||||
os = ENV['OS'] || ''
|
||||
sh('sh', '-c', "bundle exec kitchen test -c #{concurrency} #{os}")
|
||||
sh("bundle exec kitchen test -c #{concurrency} #{os}")
|
||||
end
|
||||
|
||||
task :ssh, [:target] do |_t, args|
|
||||
|
|
Loading…
Reference in a new issue