aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah <micah@riseup.net>2015-12-20 21:36:20 +0000
committerMicah <micah@riseup.net>2015-12-20 21:36:20 +0000
commit185ac30062d7aa11fc39a24aa89504e5ac0db6d9 (patch)
treee2e6feee07e90985f52e3dec204917832bc44f53
parentc410b5c8dedac62f9c586ad83f4772b5d21dea3c (diff)
parent275ca2e4cf8759cb723f1d7791515cdcbfbbe836 (diff)
downloadpuppet-apt-185ac30062d7aa11fc39a24aa89504e5ac0db6d9.tar.gz
puppet-apt-185ac30062d7aa11fc39a24aa89504e5ac0db6d9.tar.bz2
Merge branch 'gitlab_ci' into 'master'
[feat] Enable gitlab CI builds, simplify Gemfile Test this module using existing rspec test, using gitlab CI on gitlab.com shared runners. See https://gitlab.com/varac/apt/builds/473836 for the CI build of this merge req. See merge request !33
-rw-r--r--.gitlab-ci.yml12
-rw-r--r--Gemfile28
2 files changed, 14 insertions, 26 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..f7b8eca
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,12 @@
+before_script:
+ - ruby -v
+ - gem install bundler --no-ri --no-rdoc
+ - bundle install --jobs $(nproc) "${FLAGS[@]}"
+
+# don't fail on lint warnings
+rspec:
+ script:
+ - bundle exec rake lint || /bin/true
+ - bundle exec rake syntax
+ - bundle exec rake validate
+ - bundle exec rake spec
diff --git a/Gemfile b/Gemfile
index 4033611..8925a90 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,37 +1,13 @@
source "https://rubygems.org"
-def location_for(place, fake_version = nil)
- if place =~ /^(git[:@][^#]*)#(.*)/
- [fake_version, { :git => $1, :branch => $2, :require => false }].compact
- elsif place =~ /^file:\/\/(.*)/
- ['>= 0', { :path => File.expand_path($1), :require => false }]
- else
- [place, { :require => false }]
- end
-end
-
-
group :test 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"
gem "rspec-puppet-facts"
gem "mocha"
end
-
-facterversion = ENV['GEM_FACTER_VERSION'] || ENV['FACTER_GEM_VERSION']
-if facterversion
- gem 'facter', *location_for(facterversion)
-else
- gem 'facter', :require => false
-end
-
-puppetversion = ENV['GEM_PUPPET_VERSION'] || ENV['PUPPET_GEM_VERSION']
-if puppetversion
- gem 'puppet', *location_for(puppetversion)
-else
- gem 'puppet', :require => false
-end
-