coren has submitted this change and it was merged.
Change subject: contint: Add tmpfs mount in jenkins-deploy homedir for labs
slaves
......................................................................
contint: Add tmpfs mount in jenkins-deploy homedir for labs slaves
Bug: 72063
Change-Id: I126ab53813842a008871a29d43b1ea55a64214bf
---
M manifests/role/ci.pp
1 file changed, 8 insertions(+), 9 deletions(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
coren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index a0fe233..d70ab1d 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -262,7 +262,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
@@ -340,14 +340,6 @@
}
include role::ci::slave::labs::common
-
- /**
- contint::tmpfs { 'tmpfs for jenkins CI slave':
- # 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.
@@ -428,6 +420,13 @@
}
include contint::qunit_localhost
+ contint::tmpfs { 'tmpfs for jenkins CI labs slave':
+ # Jobs expect the tmpfs to be in $HOME/tmpfs
+ 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: merged
Gerrit-Change-Id: I126ab53813842a008871a29d43b1ea55a64214bf
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: coren <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
