Filippo Giunchedi has submitted this change and it was merged.
Change subject: Gerrit: Also install openjdk8 alongside 7, make it configurable
......................................................................
Gerrit: Also install openjdk8 alongside 7, make it configurable
We would like to move to 8 at some point, this makes compiling
and testing a bit easier until then.
Made it configurable so we can play with this in labs and other
places without having to swap production just yet
Change-Id: Iff8c2bacdf1fb47d14a7113dc8c2d850ebaff4d7
---
M modules/gerrit/manifests/jetty.pp
M modules/gerrit/templates/gerrit.config.erb
2 files changed, 8 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
Muehlenhoff: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/gerrit/manifests/jetty.pp
b/modules/gerrit/manifests/jetty.pp
index 21409a6..2cb443e 100644
--- a/modules/gerrit/manifests/jetty.pp
+++ b/modules/gerrit/manifests/jetty.pp
@@ -8,6 +8,7 @@
$ssh_host_key = undef,
$heap_limit = '28g',
$slave = false,
+ $java_home = '/usr/lib/jvm/java-7-openjdk-amd64/jre',
) {
include nrpe
@@ -40,7 +41,12 @@
'-Dlog4j.configuration=file:///var/lib/gerrit2/review_site/etc/log4j.properties',
]
- require_package(['openjdk-7-jdk', 'gerrit', 'libmysql-java'])
+ require_package([
+ 'openjdk-7-jdk',
+ 'openjdk-8-jdk',
+ 'gerrit',
+ 'libmysql-java'
+ ])
file { '/srv/gerrit':
ensure => directory,
diff --git a/modules/gerrit/templates/gerrit.config.erb
b/modules/gerrit/templates/gerrit.config.erb
index 6bdd332..9fd8d5d 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -33,7 +33,7 @@
smtpServer = <%= @mail_smarthost[0] %>
[container]
user = gerrit2
- javaHome = /usr/lib/jvm/java-7-openjdk-amd64/jre
+ javaHome = <%= @java_home %>
javaOptions = <% @java_options.each do |jvm_opt| %><%= jvm_opt %> <% end %>
heapLimit = <%= @heap_limit %>
slave = <%= @slave %>
--
To view, visit https://gerrit.wikimedia.org/r/321398
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iff8c2bacdf1fb47d14a7113dc8c2d850ebaff4d7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Filippo Giunchedi <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Muehlenhoff <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
