From b8a461638eca77e2fdd82c6bf07784b0b44cc917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Charaoui?= <jcharaoui@cmaisonneuve.qc.ca>
Date: Wed, 29 Jun 2016 17:57:08 +0200
Subject: Always set debian_nextcodename to 'sid' on systems running testing,
 fixes #12

---
 lib/facter/debian_nextcodename.rb | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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
-- 
cgit v1.2.3


From 9cd565f00ae8f6e10ad96c7c8ab2aa65d8fabe8a Mon Sep 17 00:00:00 2001
From: varac <varacanero@zeromail.org>
Date: Mon, 31 Oct 2016 13:46:05 +0100
Subject: 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
---
 .gitlab-ci.yml |  5 +++--
 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:
diff --git a/Gemfile b/Gemfile
index a2756c4..7ef1ec3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -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'
+
-- 
cgit v1.2.3