Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338385 )
Change subject: Introduce linters using rake
......................................................................
Introduce linters using rake
Add a Rakefile and depends on puppet-syntax/puppet-lint. That lets one
easily check syntax of manifests and templates as well as puppet style
recommandation (puppet-lint).
Ignore puppet-lint 80 chars line limit.
Instruct puppet-lint to threat module with relative path or it fails
under Jenkins which checkout the source code in a directory named after
the job.
Fix:
Unrecognised escape sequence '\.' in file
kafka/manifests/mirror/monitoring.pp at line 21
Add Gem dependecy safe_yaml ~> 1.0.4 since Puppet 3.7 fails on ruby 2.2+
(eg ruby2.4 on Mac). https://tickets.puppetlabs.com/browse/PUP-3796
Git ignore Gemfile.lock, that is only needed for deployment purposes.
To test locally:
bundle install
bundle exec rake test
Bug: T154894
Change-Id: Id8e19ee14cc1673e84278b30a5e4eddf5192ea77
---
A .gitignore
A .puppet-lint.rc
A Gemfile
A Rakefile
M manifests/mirror/monitoring.pp
5 files changed, 32 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/kafka
refs/changes/85/338385/1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..66f8ed3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/Gemfile.lock
diff --git a/.puppet-lint.rc b/.puppet-lint.rc
new file mode 100644
index 0000000..b0d12b7
--- /dev/null
+++ b/.puppet-lint.rc
@@ -0,0 +1 @@
+--no-80chars-check
diff --git a/Gemfile b/Gemfile
new file mode 100644
index 0000000..1416f0a
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,10 @@
+source 'https://rubygems.org'
+
+gem 'rake'
+gem 'puppet', '~> 3.7.0'
+# Puppet 3.7 fails on ruby 2.2+
+# https://tickets.puppetlabs.com/browse/PUP-3796
+gem 'safe_yaml', '~> 1.0.4'
+
+gem 'puppet-lint', '1.1.0'
+gem 'puppet-syntax'
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..a15ba1a
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,19 @@
+require 'bundler/setup'
+require 'puppet-lint/tasks/puppet-lint'
+require 'puppet-syntax/tasks/puppet-syntax'
+
+# To please Jenkins
+# https://github.com/rodjek/puppet-lint/issues/361
+PuppetLint.configuration.relative = true
+
+task :default => [:help]
+
+desc 'Run all build/tests commands (CI entry point)'
+task :test => [
+ :syntax,
+ :lint,
+]
+
+task :help do
+ system "rake -T"
+end
diff --git a/manifests/mirror/monitoring.pp b/manifests/mirror/monitoring.pp
index 0336719..adaa4c3 100644
--- a/manifests/mirror/monitoring.pp
+++ b/manifests/mirror/monitoring.pp
@@ -18,7 +18,7 @@
# Generate icinga alert if Kafka Server is not running.
nrpe::monitor_service { "kafka-mirror-${title}":
description => "Kafka MirrorMaker ${title}",
- nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1:1 -C java
--ereg-argument-array
'kafka.tools.MirrorMaker.+/etc/kafka/mirror/${title}/producer\.properties'",
+ nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1:1 -C java
--ereg-argument-array
'kafka.tools.MirrorMaker.+/etc/kafka/mirror/${title}/producer\\.properties'",
require => Kafka::Mirror[$title],
}
--
To view, visit https://gerrit.wikimedia.org/r/338385
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8e19ee14cc1673e84278b30a5e4eddf5192ea77
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/kafka
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
