Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: contint: Jessie does not have openjdk-6-jdk
......................................................................
contint: Jessie does not have openjdk-6-jdk
Bug: T94999
Change-Id: I62dae04544e290c31b8aded33f27fc9137ef3df0
---
M modules/contint/manifests/packages.pp
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/contint/manifests/packages.pp
b/modules/contint/manifests/packages.pp
index 7ff37a5..4339a22 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -22,7 +22,10 @@
# applications.
# (openjdk is the default distribution for the java define.
# The java define is found in modules/java/manifests/init.pp )
- require_package('openjdk-6-jdk')
+ if ! os_version( 'debian >= jessie' ) {
+ # No more available in Jessie
+ require_package('openjdk-6-jdk')
+ }
require_package('openjdk-7-jdk')
package { 'maven2':
--
To view, visit https://gerrit.wikimedia.org/r/201701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I62dae04544e290c31b8aded33f27fc9137ef3df0
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
