Andrew Bogott has submitted this change and it was merged.
Change subject: contint: generate .gitconfig files for all jenkins users
......................................................................
contint: generate .gitconfig files for all jenkins users
A .gitconfig file is required by git whenever it does commit operation.
It was previously generated by misc::contint::test::jenkins which was
only applying to the jenkins user.
This move the .gitconfig file definition from
misc::contint::test::jenkins under the role::ci::{master,slave} class
and craft .gitconfig file for the jenkins-slave user.
Change-Id: If71f4fb3dec16375ca1491ee54e8a874165c97fd
---
D files/misc/jenkins/gitconfig
M manifests/misc/contint.pp
M manifests/role/ci.pp
3 files changed, 24 insertions(+), 25 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
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 = [email protected]
diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index 3ada906..adf9263 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -29,16 +29,6 @@
# 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'];
- }
-
# FIXME needs to be migrated somewhere else
# Maybe contint::slave-scripts
file {
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index ef21461..6ba7498 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -16,6 +16,18 @@
include ::jenkins,
contint::proxy_jenkins
+ # .gitconfig file required for rare git write operations
+ git::userconfig { '.gitconfig for jenkins user':
+ homedir => '/var/lib/jenkins',
+ settings => {
+ 'user' => {
+ 'name' => 'Wikimedia Jenkins Bot',
+ 'email' => '[email protected]',
+ }, # end of [user] section
+ }, # end of settings
+ require => User['jenkins'],
+ }
+
file { '/srv/ssd/jenkins':
ensure => 'directory',
owner => 'jenkins',
@@ -93,6 +105,18 @@
require => Mount['/srv/ssd'],
}
+ # .gitconfig file required for rare git write operations
+ git::userconfig { '.gitconfig for jenkins user':
+ homedir => '/var/lib/jenkins-slave',
+ settings => {
+ 'user' => {
+ 'name' => 'Wikimedia Jenkins Bot',
+ 'email' => "jenkins-slave@${::fqdn}",
+ }, # end of [user] section
+ }, # end of settings
+ require => User['jenkins-slave'],
+ }
+
contint::tmpfs { 'tmpfs for jenkins CI slave':
user => 'jenkins-slave',
group => 'jenkins-slave',
--
To view, visit https://gerrit.wikimedia.org/r/75856
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If71f4fb3dec16375ca1491ee54e8a874165c97fd
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
