diff options
| author | varac <varacanero@zeromail.org> | 2016-10-31 13:46:05 +0100 |
|---|---|---|
| committer | Louis-Philippe Véronneau <pollito@riseup.net> | 2017-01-21 14:54:03 -0500 |
| commit | 7c8616b497f75594f478e9656d8bfea9f6ae7eca (patch) | |
| tree | f4dd1c65e10fa91b6df1da532f370945f8415bb0 | |
| parent | 01960a02d67f4c79edc0bace7f0358a19f9d3d23 (diff) | |
Fix CI, dont install beaker on gitlab CI
- Don't install `system-tests` gem group for rspec tests on CI
- Use leapcode/ruby docker image because it has a more default
ruby installation than the 'official' one.
- Use `/var/cache/gitlab-runner/` as gem install path so we can
cache this folder later
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | Gemfile | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f7b8eca..2f381cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,8 @@ +image: leapcode/ruby before_script: - ruby -v - - gem install bundler --no-ri --no-rdoc - - bundle install --jobs $(nproc) "${FLAGS[@]}" + - sudo gem install bundler --no-ri --no-rdoc + - sudo bundle install --jobs $(nproc) --without system_tests --path=/var/cache/gitlab-runner/ "${FLAGS[@]}" # don't fail on lint warnings rspec: @@ -1,10 +1,8 @@ source "https://rubygems.org" -group :test do +group :development, :unit_tests do gem "rake" gem "rspec", '< 3.2.0' - gem "puppet", ENV['PUPPET_VERSION'] || ENV['GEM_PUPPET_VERSION'] || ENV['PUPPET_GEM_VERSION'] || '~> 3.7.0' - gem "facter", ENV['FACTER_VERSION'] || ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION'] || '~> 2.2.0' gem "rspec-puppet" gem "puppetlabs_spec_helper" gem "metadata-json-lint" @@ -13,8 +11,12 @@ group :test do end group :system_tests do - gem 'beaker', :require => false - gem 'beaker-rspec', :require => false - gem 'beaker_spec_helper', :require => false - gem 'serverspec', :require => false + gem 'beaker' + gem 'beaker-rspec' + gem 'beaker_spec_helper' + gem 'serverspec' end + +gem "puppet", ENV['PUPPET_VERSION'] || ENV['GEM_PUPPET_VERSION'] || ENV['PUPPET_GEM_VERSION'] || '~> 3.7.0' +gem "facter", ENV['FACTER_VERSION'] || ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION'] || '~> 2.2.0' + |