Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/75498
Change subject: creates role::contint::jenkins::slave
......................................................................
creates role::contint::jenkins::slave
A basic role meant to be used for Continuous Integration Jenkins slaves
nodes. It regroups:
- contint::packages which provide various dependencies needed by tests
- role::jenkins::slave::production which is meant to only install
Jenkins without the CI specific stuff
Finally add in /srv/ssd/gerrit which will be the destination of Gerrit
replications. All CI slaves nodes MUST have a /srv/ssd mounted.
Change-Id: If3a4779af8c9de6bcbff01141e804a1d54f8e34c
---
A manifests/role/contint.pp
M manifests/site.pp
2 files changed, 25 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/98/75498/1
diff --git a/manifests/role/contint.pp b/manifests/role/contint.pp
new file mode 100644
index 0000000..d1569f4
--- /dev/null
+++ b/manifests/role/contint.pp
@@ -0,0 +1,23 @@
+# vim: set et ts=4 sw=4:
+
+# Set up a Jenkins slave suitable for Continuous Integration jobs execution.
+# You will need to setup the Gerrit replication in role::gerrit::production
+class role::contint::jenkins::slave {
+
+ include contint::packages,
+ role::gerrit::production::replicationdest,
+ role::jenkins::slave::production
+
+ # /srv/ssd should have been mounted at the node level. If that is not the
+ # case we have to fail.
+ Class['role::jenkins::slave::production'] -> Mount['/srv/ssd']
+
+ # Setup Gerrit replication destination:
+ file { '/srv/ssd/gerrit':
+ ensure => 'directory',
+ owner => 'gerritslave',
+ group => 'root',
+ mode => '0755',
+ }
+
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 3bbf606..de1ecbd 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -991,14 +991,13 @@
include standard,
nrpe,
- contint::packages,
contint::testswarm,
contint::website,
misc::contint::test,
misc::contint::test::jenkins,
misc::contint::android::sdk,
+ role::contint::jenkins::slave,
role::jenkins::master::production,
- role::jenkins::slave::production,
role::zuul::production,
admins::roots,
admins::jenkins
@@ -1350,8 +1349,7 @@
include standard,
admins::roots,
admins::jenkins,
- contint::packages,
- role::jenkins::slave::production # RT #5074
+ role::contint::jenkins::slave # RT #5074
# Used as a Jenkins slave so some folks need escalated privileges
$gid=500
--
To view, visit https://gerrit.wikimedia.org/r/75498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3a4779af8c9de6bcbff01141e804a1d54f8e34c
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
