[Lsb-messages] /var/www/bzr/lsb/devel/puppet-lsb r145: Require Java on build slaves (for olver-core).
Jeff Licquia
licquia at linuxfoundation.org
Sat Feb 11 02:47:06 UTC 2012
------------------------------------------------------------
revno: 145
committer: Jeff Licquia <licquia at linuxfoundation.org>
branch nick: puppet-lsb
timestamp: Fri 2012-02-10 21:47:06 -0500
message:
Require Java on build slaves (for olver-core).
modified:
modules/buildbot/manifests/slave.pp
-------------- next part --------------
=== modified file 'modules/buildbot/manifests/slave.pp'
--- a/modules/buildbot/manifests/slave.pp 2012-02-10 22:51:36 +0000
+++ b/modules/buildbot/manifests/slave.pp 2012-02-11 02:47:06 +0000
@@ -16,6 +16,11 @@
default => 'gcc-c++',
}
+ $javapkg = $operatingsystem ? {
+ /^CentOS/ => 'java-1.6.0-openjdk',
+ default => 'openjdk',
+ }
+
# Here, we figure out what user and password to use to log into the
# master. This differs per-architecture. The buildbotpw module
# is pulled in from puppet-secret, and just contains Puppet variables
@@ -74,6 +79,10 @@
ensure => present,
}
+ package { "$javapkg":
+ ensure => present,
+ }
+
# Other packages needed by this puppet module.
package { 'wget':
More information about the lsb-messages
mailing list