Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/95706
Change subject: misc::contint merged in role::ci::master
......................................................................
misc::contint merged in role::ci::master
misc::contint has finally be phased out. The remaining bits were
enforcing file modes for the Jenkins master, so that is better done in
role::ci::master directly.
Change-Id: I8f513583e4998795977e280c6060e29f2b79ff34
---
D manifests/misc/contint.pp
M manifests/role/ci.pp
M manifests/site.pp
3 files changed, 18 insertions(+), 30 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/06/95706/1
diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
deleted file mode 100644
index edd53f7..0000000
--- a/manifests/misc/contint.pp
+++ /dev/null
@@ -1,28 +0,0 @@
-# vim: set ts=2 sw=2 et :
-# continuous integration (CI)
-
-# CI test server as per RT #1204
-class misc::contint::test {
-
- # Creates placeholders for slave-scripts. This need to be moved out to a
- # better place under contint module.
- class jenkins {
-
- # As of October 2013, the slave scripts are installed with
- # contint::slave-scripts and land under /srv/jenkins.
- # FIXME: clean up Jenkins jobs to no more refer to the paths below:
- file {
- '/var/lib/jenkins/.git':
- ensure => directory,
- mode => '2775', # group sticky bit
- group => 'jenkins';
- '/var/lib/jenkins/bin':
- ensure => directory,
- owner => 'jenkins',
- group => 'wikidev',
- mode => '0775';
- }
-
- }
-
-}
diff --git a/manifests/role/ci.pp b/manifests/role/ci.pp
index dcbefe1..018bbe2 100644
--- a/manifests/role/ci.pp
+++ b/manifests/role/ci.pp
@@ -5,6 +5,8 @@
# Setup a Jenkins installation attended to be used as a master. This setup some
# CI specific requirements such as having workspace on a SSD device and Jenkins
# monitoring.
+#
+# CI test server as per RT #1204
class role::ci::master {
system::role { 'role::ci::master': description => 'CI Jenkins master' }
@@ -28,6 +30,22 @@
require => User['jenkins'],
}
+ # As of October 2013, the slave scripts are installed with
+ # contint::slave-scripts and land under /srv/jenkins.
+ # FIXME: clean up Jenkins jobs to no more refer to the paths below:
+ file { '/var/lib/jenkins/.git':
+ ensure => directory,
+ mode => '2775', # group sticky bit
+ group => 'jenkins',
+ }
+
+ file { '/var/lib/jenkins/bin':
+ ensure => directory,
+ owner => 'jenkins',
+ group => 'wikidev',
+ mode => '0775';
+ }
+
file { '/srv/ssd/jenkins':
ensure => 'directory',
owner => 'jenkins',
diff --git a/manifests/site.pp b/manifests/site.pp
index b35d66b..1f551dc 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1094,8 +1094,6 @@
include standard,
nrpe,
contint::firewall,
- misc::contint::test, # Setup iptables rules
- misc::contint::test::jenkins, # FIXME slave scripts
contint::android-sdk,
role::ci::master,
role::ci::slave,
--
To view, visit https://gerrit.wikimedia.org/r/95706
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f513583e4998795977e280c6060e29f2b79ff34
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
