Hashar has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/201701

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(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/201701/1

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: newchange
Gerrit-Change-Id: I62dae04544e290c31b8aded33f27fc9137ef3df0
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

Reply via email to