Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/356241 )
Change subject: contint: Only install java 7 on trusty and jessie
......................................................................
contint: Only install java 7 on trusty and jessie
stretch does not have the package java 7.
Bug: T166611
Change-Id: If58499a2a9ab88a614232cfbde4f35256c749407
---
M modules/contint/manifests/packages/java.pp
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/contint/manifests/packages/java.pp
b/modules/contint/manifests/packages/java.pp
index 25f3961..fce66f3 100644
--- a/modules/contint/manifests/packages/java.pp
+++ b/modules/contint/manifests/packages/java.pp
@@ -1,6 +1,8 @@
class contint::packages::java {
- require_package('openjdk-7-jdk')
+ if os_version('ubuntu == trusty || debian == jessie') {
+ require_package('openjdk-7-jdk')
+ }
if os_version('debian >= jessie') {
require_package('openjdk-8-jdk')
--
To view, visit https://gerrit.wikimedia.org/r/356241
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If58499a2a9ab88a614232cfbde4f35256c749407
Gerrit-PatchSet: 8
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
