Hashar has uploaded a new change for review.
https://gerrit.wikimedia.org/r/53423
Change subject: contint: get rid of Sun JDK
......................................................................
contint: get rid of Sun JDK
We no more need the Sun JDK so just remove the class. Will purge the
packages manually once this is merged.
Change-Id: If4030ed7e6334f8c2df129183fe2e091d067a0ff
---
M manifests/misc/contint.pp
1 file changed, 0 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/23/53423/1
diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp
index a74b314..ef85a4f 100644
--- a/manifests/misc/contint.pp
+++ b/manifests/misc/contint.pp
@@ -1,44 +1,9 @@
-class misc::contint::jdk {
-# JDK for android continuous integration
-# extra stuff for license agreement acceptance
-# Based off of
http://offbytwo.com/2011/07/20/scripted-installation-java-ubuntu.html
-
- package { "debconf-utils":
- ensure => installed
- }
-
- exec { "agree-to-jdk-license":
- command => "/bin/echo -e sun-java6-jdk
shared/accepted-sun-dlj-v1-1 select true | debconf-set-selections",
- unless => "debconf-get-selections | grep
'sun-java6-jdk.*shared/accepted-sun-dlj-v1-1.*true'",
- path => ["/bin", "/usr/bin"], require =>
Package["debconf-utils"],
- }
-
- exec { "agree-to-jre-license":
- command => "/bin/echo -e sun-java6-jre
shared/accepted-sun-dlj-v1-1 select true | debconf-set-selections",
- unless => "debconf-get-selections | grep
'sun-java6-jre.*shared/accepted-sun-dlj-v1-1.*true'",
- path => ["/bin", "/usr/bin"], require =>
Package["debconf-utils"],
- }
-
- package { "sun-java6-jdk":
- ensure => latest,
- require => [ Exec["agree-to-jdk-license"] ],
- }
-
- package { "sun-java6-jre":
- ensure => latest,
- require => [ Exec["agree-to-jre-license"] ],
- }
-
-}
-
class misc::contint::android::sdk {
# Class installing prerequisites to the Android SDK
# The SDK itself need to be installed manually for now.
#
# Help link: http://developer.android.com/sdk/installing.html
- # We really want Sun/Oracle JDK
- require misc::contint::jdk
include generic::packages::ant18
# 32bit libs needed by Android SDK
--
To view, visit https://gerrit.wikimedia.org/r/53423
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If4030ed7e6334f8c2df129183fe2e091d067a0ff
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
