Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/170012
Change subject: contint: Graphviz on Jenkins slaves
......................................................................
contint: Graphviz on Jenkins slaves
We are going to generate documentation using Doxygen which can generates
graphs using 'dot' provided by the graphviz package.
graphviz is a preexisting dependency for the Jenkins master gallium
which is also a slave. To avoid duplicate definition, make use of
the recent require_package().
Bug: 72454
Change-Id: Iab7b1288478f1534fd3e34f7e486656d88129ec1
---
M modules/contint/manifests/packages.pp
M modules/jenkins/manifests/init.pp
2 files changed, 5 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/12/170012/1
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index eddcf91..5cb826f 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -96,6 +96,9 @@
ensure => present,
}
+ # For Doxygen based documentations
+ require_package('graphviz')
+
if ! defined ( Package['python-requests'] ) {
package { 'python-requests':
ensure => present,
diff --git a/modules/jenkins/manifests/init.pp
b/modules/jenkins/manifests/init.pp
index a7b6c94..58d8cef 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -9,10 +9,8 @@
ensure => present,
}
- # Graphiz is needed by the job dependency graph plugin
- package { 'graphviz':
- ensure => present,
- }
+ # Graphiz on Jenkins master for the 'job dependency graph' plugin
+ require_package('graphviz')
# Jenkins should write everything group writable so admins can interact
with
# files easily, hence we need it to run with umask 0002.
--
To view, visit https://gerrit.wikimedia.org/r/170012
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab7b1288478f1534fd3e34f7e486656d88129ec1
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
