Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/311959
Change subject: contint: migrate slaves to /srv
......................................................................
contint: migrate slaves to /srv
We have used /mnt for legacy reason, that conflicts with the new
standard /srv such as used for the beta cluster deployment servers.
Migrate to /srv
TODO: fix the CI slaves.
Change-Id: I1bcfaeb930efdf892b877742ad2d55eb88ef7e3c
---
M modules/role/manifests/ci/slave/labs/common.pp
1 file changed, 47 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/311959/1
diff --git a/modules/role/manifests/ci/slave/labs/common.pp
b/modules/role/manifests/ci/slave/labs/common.pp
index b11bc9d..090e2bd 100644
--- a/modules/role/manifests/ci/slave/labs/common.pp
+++ b/modules/role/manifests/ci/slave/labs/common.pp
@@ -6,51 +6,78 @@
include contint::packages::base
# Need the labs instance extended disk space
- require role::labs::lvm::mnt
+ require role::labs::lvm::srv
- # Home dir for Jenkins agent
- #
- # /var/lib and /home are too small to hold Jenkins workspaces
- file { '/mnt/jenkins-workspace':
+ # We no more use role::labs::lvm::mnt
+ mount { '/mnt':
+ ensure => absent,
+ }
+
+ file { '/srv/jenkins':
ensure => directory,
owner => 'jenkins-deploy',
group => 'wikidev', # useless, but we need a group
mode => '0775',
- require => Mount['/mnt'],
+ require => Mount['/srv'],
+ }
+
+ # Home dir for Jenkins agent
+ #
+ # /var/lib and /home are too small to hold Jenkins workspaces
+ file { '/srv/jenkins/workspace':
+ ensure => directory,
+ owner => 'jenkins-deploy',
+ group => 'wikidev', # useless, but we need a group
+ mode => '0775',
+ require => File['/srv/jenkins'],
}
# Create a homedir for `jenkins-deploy` so we get plenty of disk space.
- # The user is only LDAP and is not created by puppet
+ # The user is only LDAP and is not created by puppet. LDAP has the homedir
+ # set to /mnt/home/jenkins-deploy for legacy reason.
# T63144
file { '/mnt/home':
+ ensure => directory,
+ mode => '0755',
+ owner => 'root',
+ group => 'root',
+ require => Mount['/mnt'], # ensure => absent
+ }
+
+ file { '/mnt/home/jenkins-deploy':
+ ensure => link,
+ target => '/srv/jenkins/home/jenkins-deploy',
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ require => File['/mnt/home'],
+ }
+
+ file { '/srv/jenkins/home':
ensure => directory,
owner => 'root',
group => 'root',
mode => '0755',
- require => Mount['/mnt'],
+ require => File['/srv/jenkins'],
}
- file { '/mnt/home/jenkins-deploy':
- ensure => directory,
- owner => 'jenkins-deploy',
- group => 'wikidev',
- mode => '0775',
- }
-
- # drop settings file with old proxy settings
- file { '/mnt/home/jenkins-deploy/.m2/settings.xml':
- ensure => absent
+ file { '/srv/jenkins/home/jenkins-deploy':
+ ensure => directory,
+ owner => 'jenkins-deploy',
+ group => 'wikidev',
+ mode => '0775',
+ require => File['/srv/jenkins/home'],
}
git::userconfig { '.gitconfig for jenkins-deploy user':
- homedir => '/mnt/home/jenkins-deploy',
+ homedir => '/srv/jenkins/home/jenkins-deploy',
settings => {
'user' => {
'name' => 'Wikimedia Jenkins Deploy',
'email' => "jenkins-deploy@${::fqdn}",
}, # end of [user] section
}, # end of settings
- require => File['/mnt/home/jenkins-deploy'],
+ require => File['/srv/jenkins/home/jenkins-deploy'],
}
# The slaves on labs use the `jenkins-deploy` user which is already
--
To view, visit https://gerrit.wikimedia.org/r/311959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1bcfaeb930efdf892b877742ad2d55eb88ef7e3c
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
