diff options
| author | intrigeri <intrigeri@boum.org> | 2016-11-02 07:32:03 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2016-11-02 07:32:03 +0000 |
| commit | 5e39cd0c5039223f11eb548e7dca5b43229b3627 (patch) | |
| tree | 7181cc153b423b6e2581fee7ff9554e79a815e3b | |
| parent | 20c90d2dc61c2b1d15bebc88c839e90ef99e4b2e (diff) | |
| parent | d4c87772bd31821c91f9ba149b5dc06959bc7155 (diff) | |
Merge remote-tracking branch 'shared/master' into feature/debian_codename_to_version
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rw-r--r-- | Gemfile | 16 | ||||
| -rw-r--r-- | lib/facter/debian_nextcodename.rb | 8 |
3 files changed, 17 insertions, 12 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' + diff --git a/lib/facter/debian_nextcodename.rb b/lib/facter/debian_nextcodename.rb index c4c569b..654fe20 100644 --- a/lib/facter/debian_nextcodename.rb +++ b/lib/facter/debian_nextcodename.rb @@ -4,8 +4,10 @@ rescue LoadError require "#{File.dirname(__FILE__)}/util/debian" end -def debian_codename_to_next(codename) - if codename == "sid" +def debian_codename_to_next(codename, release) + if release == "testing" + return "sid" + elsif release == "unstable" return "experimental" else codenames = Facter::Util::Debian::CODENAMES @@ -18,6 +20,6 @@ end Facter.add(:debian_nextcodename) do confine :operatingsystem => 'Debian' setcode do - debian_codename_to_next(Facter.value('debian_codename')) + debian_codename_to_next(Facter.value('debian_codename'), Facter.value('debian_release')) end end |