Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173512
Change subject: [WIP] contint: Add tmpfs mount in jenkins-deploy homedir for
labs slaves
......................................................................
[WIP] contint: Add tmpfs mount in jenkins-deploy homedir for labs slaves
Bug: 72063
Change-Id: I126ab53813842a008871a29d43b1ea55a64214bf
---
M manifests/role/ci.pp
1 file changed, 9 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/173512/1
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index e6f5d3e..da1fd64 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -242,7 +242,7 @@
require => $slash_mnt_require,
}
- # Create a homedir for `jenkins-deploy` so it does not ends up being
created
+ # Create a homedir for `jenkins-deploy` so it does not end up being created
# on /home which is using GlusterFS on the integration project. The user
is
# only LDAP and is not created by puppet
# bug 61144
@@ -320,20 +320,6 @@
}
include role::ci::slave::labs::common
-
- /**
- * FIXME breaks puppet because jenkins-deploy is not known
- * by puppet since it is provided via LDAP.
- */
- /**
- contint::tmpfs { 'tmpfs for jenkins CI slave':
- user => 'jenkins-deploy',
- group => 'wikidev',
- # Jobs expect the tmpfs to be in $HOME/tmpfs
- mount_point => '/home/jenkins-deploy/tmpfs',
- size => '128M',
- }
- **/
# We are in labs context, so use /mnt (== /dev/vdb)
# Never EVER think about using GlusterFS.
@@ -414,6 +400,14 @@
}
include contint::qunit_localhost
+ contint::tmpfs { 'tmpfs for jenkins labs slaves':
+ user => 'jenkins-deploy',
+ group => 'root',
+ mount_point => '/mnt/home/jenkins-deploy/tmpfs',
+ size => '512M',
+ require => File['/mnt/home/jenkins-deploy'],
+ }
+
# Trebuchet replacement on labs
include contint::slave-scripts
--
To view, visit https://gerrit.wikimedia.org/r/173512
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I126ab53813842a008871a29d43b1ea55a64214bf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
