Faidon has submitted this change and it was merged.
Change subject: contint: move tmpfs disk to the module
......................................................................
contint: move tmpfs disk to the module
The continuous integration server requires a tmpfs mount to write sqlite
files too. This is due to Precise introducing some slower disks access
that cripples the tests.
Change-Id: I659c126abe3917d7ca4d0215582c008ac9ae8d1f
---
M manifests/misc/contint.pp
A modules/contint/manifests/tmpfs.pp
2 files changed, 24 insertions(+), 17 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index bccc931..422aba3 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -60,6 +60,7 @@
java { 'java-6-openjdk': version => 6, alternative => true }
java { 'java-7-openjdk': version => 7, alternative => false }
+ include ::contint::tmpfs
file {
"/var/lib/jenkins/.gitconfig":
@@ -69,23 +70,6 @@
ensure => present,
source =>
"puppet:///files/misc/jenkins/gitconfig",
require => User['jenkins'];
- }
-
- # Setup tmpfs to write SQLite files to
- file { '/var/lib/jenkins/tmpfs':
- ensure => directory,
- mode => 0755,
- owner => jenkins,
- group => jenkins,
- require => [ User['jenkins'], Group['jenkins'] ];
- }
-
- mount { '/var/lib/jenkins/tmpfs':
- ensure => mounted,
- device => 'tmpfs',
- fstype => 'tmpfs',
- options =>
'noatime,defaults,size=512M,mode=755,uid=jenkins,gid=jenkins',
- require => [ User['jenkins'], Group['jenkins'],
File['/var/lib/jenkins/tmpfs'] ];
}
file {
diff --git a/modules/contint/manifests/tmpfs.pp
b/modules/contint/manifests/tmpfs.pp
new file mode 100644
index 0000000..3311ec1
--- /dev/null
+++ b/modules/contint/manifests/tmpfs.pp
@@ -0,0 +1,23 @@
+class contint::tmpfs {
+
+ include jenkins::user
+
+ # Setup tmpfs to write SQLite files to
+ file { '/var/lib/jenkins/tmpfs':
+ ensure => directory,
+ mode => '0755',
+ owner => jenkins,
+ group => jenkins,
+ require => [ User['jenkins'], Group['jenkins'] ],
+ }
+
+ mount { '/var/lib/jenkins/tmpfs':
+ ensure => mounted,
+ device => 'tmpfs',
+ fstype => 'tmpfs',
+ options => 'noatime,defaults,size=512M,mode=755,uid=jenkins,gid=jenkins',
+ require => [ User['jenkins'], Group['jenkins'],
+ File['/var/lib/jenkins/tmpfs'] ],
+ }
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/53424
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I659c126abe3917d7ca4d0215582c008ac9ae8d1f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Faidon <fai...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
