Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75856
Change subject: contint: jenkins .gitconfig generated by git::userconfig
......................................................................
contint: jenkins .gitconfig generated by git::userconfig
Change-Id: If71f4fb3dec16375ca1491ee54e8a874165c97fd
---
D files/misc/jenkins/gitconfig
M manifests/misc/contint.pp
2 files changed, 9 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/56/75856/1
diff --git a/files/misc/jenkins/gitconfig b/files/misc/jenkins/gitconfig
deleted file mode 100644
index fee04f5..0000000
--- a/files/misc/jenkins/gitconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# vim: filetype=gitconfig
-#
-# This file is managed by Puppet!
-# puppet:///files/misc/jenkins/gitconfig
-#
-
-# Jenkins might have to locally merges commits for testing. Git explicitly
-# requires a user name and some email or it will complains, die out and
-# never do the merge.
-# Merge commits are never going to be submitted anyway so we can fill this
-# part with anything we want as long as it looks valid to git.
-
-[user]
- name = Wikimedia Jenkins Bot
- email = jenk...@gallium.wikimedia.org
diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index 24c321e..ec7619e 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -29,14 +29,15 @@
# better place under contint module.
class jenkins {
- file {
- '/var/lib/jenkins/.gitconfig':
- ensure => present,
- mode => '0444',
- owner => 'jenkins',
- group => 'jenkins',
- source => 'puppet:///files/misc/jenkins/gitconfig',
- require => User['jenkins'];
+ git::userconfig { '.gitconfig for jenkins user':
+ homedir => '/var/lib/jenkins',
+ settings => {
+ 'user' => {
+ 'name' => 'Wikimedia Jenkins Bot',
+ 'email' => 'jenk...@gallium.wikimedia.org',
+ }, # end of [user] section
+ }, # end of settings
+ require => User['jenkins'],
}
# FIXME needs to be migrated somewhere else
--
To view, visit https://gerrit.wikimedia.org/r/75856
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If71f4fb3dec16375ca1491ee54e8a874165c97fd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
