Yuvipanda has submitted this change and it was merged. Change subject: Remove androidsdk module ......................................................................
Remove androidsdk module It isn't really used anywhere. The current build setup is on the mobile project in labs, and uses a small shell script to set itself up. Setting up androidsdk in a puppet friendly way is fairly difficult, and we shouldn't be needing it anywhere else other than the build server, so killing this is probably the right way to go. The current setup also uses lib32* packages when in reality it should be using multiarch, but we do not need multiarch anywhere else so it probably isn't worth the effort. Adds ant and openjdk-7-jdk packages back to dev_environ for toollabs, since they were previously removed from there because they were specified in androidsdk Change-Id: I54219db78903eb5c48dc5e9c23306765c05b4910 --- D modules/androidsdk/manifests/dependencies.pp M modules/contint/manifests/packages.pp M modules/toollabs/manifests/dev_environ.pp M modules/toollabs/manifests/exec_environ.pp 4 files changed, 2 insertions(+), 54 deletions(-) Approvals: Yuvipanda: Looks good to me, approved Hashar: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/modules/androidsdk/manifests/dependencies.pp b/modules/androidsdk/manifests/dependencies.pp deleted file mode 100644 index 705a390..0000000 --- a/modules/androidsdk/manifests/dependencies.pp +++ /dev/null @@ -1,43 +0,0 @@ -# == Class androidsdk::dependencies -# -# 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 -# -# == Parameters -# -# [*ensure*] puppet stanza passed to package definitions. Default: 'present' -class androidsdk::dependencies( $ensure = 'present' ) { - - if ! defined(Package['ant']) { - package { 'ant': - ensure => $ensure, - } - } - - package { 'openjdk-7-jdk': - ensure => $ensure, - } - - # 32bit compat libraries needed by AndroidSDK - # They have different names in precise and trusty - if $::lsbdistcodename == 'precise' { - package { [ - 'libgcc1:i386', - 'libncurses5:i386', - 'libstdc++6:i386', - 'zlib1g:i386', - ]: ensure => $ensure - } - } else { - package { [ - 'lib32stdc++6', - 'lib32z1', - 'lib32ncurses5', - 'lib32bz2-1.0', - ]: ensure => $ensure - } - } -} diff --git a/modules/contint/manifests/packages.pp b/modules/contint/manifests/packages.pp index 6542d57..29a8193 100644 --- a/modules/contint/manifests/packages.pp +++ b/modules/contint/manifests/packages.pp @@ -5,13 +5,6 @@ # class contint::packages { - if os_version('ubuntu precise') { - # Will stay on Precise and not reconducted on Trusty. Ie the jobs - # depending on Android SDK will eventually be phased out whenever we - # have time to do so. - include androidsdk::dependencies - } - include ::mediawiki::packages include ::mediawiki::packages::multimedia # T76661 diff --git a/modules/toollabs/manifests/dev_environ.pp b/modules/toollabs/manifests/dev_environ.pp index 3df5be0..f4ce015 100644 --- a/modules/toollabs/manifests/dev_environ.pp +++ b/modules/toollabs/manifests/dev_environ.pp @@ -39,6 +39,7 @@ } package { [ + 'ant', 'apt-file', 'autoconf', 'build-essential', # for dpkg @@ -50,6 +51,7 @@ 'emacs', 'fakeroot', # for dpkg 'gcj-jdk', # Bug 56995 + 'openjdk-7-jdk', 'ipython', # Bug 56995 'joe', # Bug 62236. 'libdjvulibre-dev', # Bug 56972 diff --git a/modules/toollabs/manifests/exec_environ.pp b/modules/toollabs/manifests/exec_environ.pp index 8691140..3ea0322 100644 --- a/modules/toollabs/manifests/exec_environ.pp +++ b/modules/toollabs/manifests/exec_environ.pp @@ -358,10 +358,6 @@ ensure => latest, } - class { 'androidsdk::dependencies': - ensure => latest, - } - file { '/etc/mysql/conf.d/override.my.cnf': ensure => file, mode => '0444', -- To view, visit https://gerrit.wikimedia.org/r/183790 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54219db78903eb5c48dc5e9c23306765c05b4910 Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <[email protected]> Gerrit-Reviewer: Hashar <[email protected]> Gerrit-Reviewer: Yuvipanda <[email protected]> Gerrit-Reviewer: coren <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
