Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/331330 )
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 double quoted string containing no variables in manifests/monitor/statsd.pp Bug: T154894 Change-Id: Id8e19ee14cc1673e84278b30a5e4eddf5192ea77 --- A .puppet-lint.rc A Gemfile A Gemfile.lock A Rakefile M manifests/monitor/statsd.pp 5 files changed, 52 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/varnishkafka refs/changes/30/331330/1 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..fa76f85 --- /dev/null +++ b/Gemfile @@ -0,0 +1,6 @@ +source 'https://rubygems.org' + +gem 'rake' +gem 'puppet', '~> 3.7.0' +gem 'puppet-lint', '1.1.0' +gem 'puppet-syntax' diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 0000000..9642ca1 --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,24 @@ +GEM + remote: https://rubygems.org/ + specs: + facter (2.4.6) + hiera (1.3.4) + json_pure + json_pure (2.0.2) + puppet (3.7.5) + facter (> 1.6, < 3) + hiera (~> 1.0) + json_pure + puppet-lint (1.1.0) + puppet-syntax (2.2.0) + rake + rake (12.0.0) + +PLATFORMS + ruby + +DEPENDENCIES + puppet (~> 3.7.0) + puppet-lint (= 1.1.0) + puppet-syntax + rake 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/monitor/statsd.pp b/manifests/monitor/statsd.pp index e5b740d..cf45c8f 100644 --- a/manifests/monitor/statsd.pp +++ b/manifests/monitor/statsd.pp @@ -5,8 +5,8 @@ # define varnishkafka::monitor::statsd( $log_statistics_file = "/var/cache/varnishkafka/${name}.stats.json", - $graphite_metric_prefix = "varnishkafka.stats", - $statsd_host_port = "localhost:8125", + $graphite_metric_prefix = 'varnishkafka.stats', + $statsd_host_port = 'localhost:8125', ) { require ::varnishkafka -- To view, visit https://gerrit.wikimedia.org/r/331330 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id8e19ee14cc1673e84278b30a5e4eddf5192ea77 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/varnishkafka Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
