Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/334288 )
Change subject: jenkins: Linting fixes
......................................................................
jenkins: Linting fixes
Use full names for class names, as relative names are not allowed in
future Puppet versions
Add trailing commas to abide by the Coding Style guidelines
Bug: T93645
Change-Id: If0b44623322c486eea69f173c65ac5b0ec28b716
---
M modules/jenkins/manifests/init.pp
M modules/jenkins/manifests/slave.pp
M modules/jenkins/manifests/user.pp
3 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/jenkins/manifests/init.pp
b/modules/jenkins/manifests/init.pp
index f5768bc..37f5140 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -18,8 +18,8 @@
$service_enable = true,
)
{
- require jenkins::user
- require jenkins::group
+ require ::jenkins::user
+ require ::jenkins::group
# We want to run Jenkins under Java 7.
ensure_packages(['openjdk-7-jre-headless'])
@@ -85,7 +85,7 @@
nrpe::monitor_service { 'jenkins':
description => 'jenkins_service_running',
contact_group => 'contint',
- nrpe_command => "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1
--ereg-argument-array '^/usr/bin/java .*-jar /usr/share/jenkins/jenkins.war'"
+ nrpe_command => "/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1
--ereg-argument-array '^/usr/bin/java .*-jar /usr/share/jenkins/jenkins.war'",
}
file { '/var/lib/jenkins':
diff --git a/modules/jenkins/manifests/slave.pp
b/modules/jenkins/manifests/slave.pp
index a6b3ea9..f07e3dd 100644
--- a/modules/jenkins/manifests/slave.pp
+++ b/modules/jenkins/manifests/slave.pp
@@ -6,7 +6,7 @@
$workdir = '/var/lib/jenkins-slave',
) {
- include jenkins::slave::requisites
+ include ::jenkins::slave::requisites
group { $user:
ensure => present,
diff --git a/modules/jenkins/manifests/user.pp
b/modules/jenkins/manifests/user.pp
index bfae8e0..22b5d0f 100644
--- a/modules/jenkins/manifests/user.pp
+++ b/modules/jenkins/manifests/user.pp
@@ -1,6 +1,6 @@
class jenkins::user {
- include jenkins::group
+ include ::jenkins::group
user { 'jenkins':
home => '/var/lib/jenkins',
--
To view, visit https://gerrit.wikimedia.org/r/334288
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If0b44623322c486eea69f173c65ac5b0ec28b716
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Juniorsys <juniorsys_wikime...@outlook.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
