Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/361578 )
Change subject: jenkins: fix spec
......................................................................
jenkins: fix spec
os_version needs lsbdistid/lisbdistrelease. Provide them as default
facts targetting Jessie.
Change-Id: I0a3f898ff46e2b80dec47d4e10e9a764361cc93e
---
M modules/jenkins/spec/classes/jenkins_spec.rb
M modules/jenkins/spec/spec_helper.rb
2 files changed, 5 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/78/361578/1
diff --git a/modules/jenkins/spec/classes/jenkins_spec.rb
b/modules/jenkins/spec/classes/jenkins_spec.rb
index 7ff5676..6a7458e 100644
--- a/modules/jenkins/spec/classes/jenkins_spec.rb
+++ b/modules/jenkins/spec/classes/jenkins_spec.rb
@@ -1,9 +1,6 @@
require 'spec_helper'
describe 'jenkins' do
- let(:facts) { {
- :initsystem => 'systemd', # For systemd::syslog
- } }
let(:params) { {
:prefix => '/ci',
} }
diff --git a/modules/jenkins/spec/spec_helper.rb
b/modules/jenkins/spec/spec_helper.rb
index 421fd71..7af690f 100644
--- a/modules/jenkins/spec/spec_helper.rb
+++ b/modules/jenkins/spec/spec_helper.rb
@@ -6,4 +6,9 @@
RSpec.configure do |c|
c.module_path = File.join(fixture_path, 'modules')
c.manifest_dir = File.join(fixture_path, 'manifests')
+ c.default_facts = {
+ :initsystem => 'systemd',
+ :lsbdistid => 'Debian',
+ :lsbdistrelease => '8.0',
+ }
end
--
To view, visit https://gerrit.wikimedia.org/r/361578
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0a3f898ff46e2b80dec47d4e10e9a764361cc93e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits