Dzahn has submitted this change and it was merged.
Change subject: contint: lint packages.pp before spliting up
......................................................................
contint: lint packages.pp before spliting up
Change-Id: I21aac322abc1afb228e0cf1f69ec2dd3ef6e0339
---
M modules/contint/manifests/packages.pp
1 file changed, 172 insertions(+), 165 deletions(-)
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.pp
b/modules/contint/manifests/packages.pp
index 72073cb..2e410fb 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -5,207 +5,214 @@
#
class contint::packages {
- # Make sure we use ant version 1.8 or we will have a conflict
- # with android
- include contint::packages::ant18
+ # Make sure we use ant version 1.8 or we will have a conflict
+ # with android
+ include contint::packages::ant18
- # Get several OpenJDK packages including the jdk to build mobile
- # applications.
- # (openjdk is the default distribution for the java define.
- # The java define is found in modules/java/manifests/init.pp )
- package { 'openjdk-6-jre':
- ensure => present,
- }
- package { 'openjdk-7-jre':
- ensure => present,
- }
+ # Get several OpenJDK packages including the jdk to build mobile
+ # applications.
+ # (openjdk is the default distribution for the java define.
+ # The java define is found in modules/java/manifests/init.pp )
+ package { 'openjdk-6-jre':
+ ensure => present,
+ }
+ package { 'openjdk-7-jre':
+ ensure => present,
+ }
- package { 'maven2':
- ensure => present;
- }
+ package { 'maven2':
+ ensure => present,
+ }
- # Get perl dependencies so we can lint the wikibugs perl script
+ # Get perl dependencies so we can lint the wikibugs perl script
include misc::irc::wikibugs::packages
- # Let us create packages from Jenkins jobs
- include misc::package-builder
+ # Let us create packages from Jenkins jobs
+ include misc::package-builder
- # Lint authdns templates & config
- include authdns::lint
+ # Lint authdns templates & config
+ include authdns::lint
- include svn::client
+ include svn::client
- # PHP related packages
- package { [
- 'php-pear',
- 'php5-cli',
- 'php5-curl',
- 'php5-dev', # phpize
- 'php5-gd',
- 'php5-intl',
- 'php5-mysql',
- 'php5-parsekit',
- 'php5-pgsql',
- 'php5-sqlite',
- 'php5-tidy',
- 'php5-xdebug',
- ]: ensure => present,
- }
+ # PHP related packages
+ package { [
+ 'php-pear',
+ 'php5-cli',
+ 'php5-curl',
+ 'php5-dev', # phpize
+ 'php5-gd',
+ 'php5-intl',
+ 'php5-mysql',
+ 'php5-parsekit',
+ 'php5-pgsql',
+ 'php5-sqlite',
+ 'php5-tidy',
+ 'php5-xdebug',
+ ]:
+ ensure => present,
+ }
- # luasandbox is a WMF package, we always want to use the very latest version
- # since the package is used by unit tests
- package { [
- 'php-luasandbox',
- ]: ensure => latest,
- }
+ # luasandbox is a WMF package, we always want to use the very latest
version
+ # since the package is used by unit tests
+ package { [
+ 'php-luasandbox',
+ ]:
+ ensure => latest,
+ }
- # Database related
- package { [
- 'mysql-server',
- 'sqlite3',
- 'postgresql',
- ]: ensure => present,
- }
+ # Database related
+ package { [
+ 'mysql-server',
+ 'sqlite3',
+ 'postgresql',
+ ]:
+ ensure => present,
+ }
- # Development packages
- package { [
- 'imagemagick',
- 'librsvg2-2',
- 'librsvg2-bin',
+ # Development packages
+ package { [
+ 'imagemagick',
+ 'librsvg2-2',
+ 'librsvg2-bin',
- 'asciidoc',
- 'rake',
- 'ruby1.9.3', # To let us syntax check scripts using 1.9
+ 'asciidoc',
+ 'rake',
+ 'ruby1.9.3', # To let us syntax check scripts using 1.9
- 'pep8',
- 'pyflakes',
- 'pylint',
+ 'pep8',
+ 'pyflakes',
+ 'pylint',
- 'luajit',
- 'libevent-dev', # PoolCounter daemon
- 'liblua5.1-0-dev',
- 'g++',
- 'libthai-dev',
+ 'luajit',
+ 'libevent-dev', # PoolCounter daemon
+ 'liblua5.1-0-dev',
+ 'g++',
+ 'libthai-dev',
- 'doxygen',
- 'python-sphinx', # python documentation
- 'ruby-jsduck',
- ]: ensure => present,
- }
+ 'doxygen',
+ 'python-sphinx', # python documentation
+ 'ruby-jsduck',
+ ]:
+ ensure => present,
+ }
- # Includes packages needed for building
- # analytics and statistics related packages.
+ # Includes packages needed for building
+ # analytics and statistics related packages.
- # these are needed to build libanon and udp-filter
- package { ['pkg-config', 'libpcap-dev', 'libdb-dev']:
- ensure => 'installed',
- }
+ # these are needed to build libanon and udp-filter
+ package { ['pkg-config', 'libpcap-dev', 'libdb-dev']:
+ ensure => 'installed',
+ }
- # Used to build analytics udp-filters
- package { ['libcidr0-dev', 'libanon0-dev']:
- ensure => 'latest',
- }
+ # Used to build analytics udp-filters
+ package { ['libcidr0-dev', 'libanon0-dev']:
+ ensure => 'latest',
+ }
- # Used for mobile device classification in Kraken:
- package { [
- 'libdclass0',
- 'libdclass0-dev',
- 'libdclass-jni',
- 'libdclass-java',
- 'libdclass-data',
- ]:
- ensure => 'installed',
- }
+ # Used for mobile device classification in Kraken:
+ package { [
+ 'libdclass0',
+ 'libdclass0-dev',
+ 'libdclass-jni',
+ 'libdclass-java',
+ 'libdclass-data',
+ ]:
+ ensure => 'installed',
+ }
- # these packages are used by the tests for wikistats to parse the
- # generated reports to see if they are correct
+ # these packages are used by the tests for wikistats to parse the
+ # generated reports to see if they are correct
- package { [
- 'libhtml-treebuilder-xpath-perl',
- 'libjson-xs-perl',
- 'libnet-patricia-perl',
- 'libtemplate-perl',
- 'libweb-scraper-perl',
- ]:
- ensure => 'installed',
- }
+ package { [
+ 'libhtml-treebuilder-xpath-perl',
+ 'libjson-xs-perl',
+ 'libnet-patricia-perl',
+ 'libtemplate-perl',
+ 'libweb-scraper-perl',
+ ]:
+ ensure => 'installed',
+ }
- # need geoip to build udp-filter
- include geoip
+ # need geoip to build udp-filter
+ include geoip
+ # Node.js evolves quickly so we want to update it
+ # automatically.
+ package { 'nodejs':
+ ensure => latest,
+ }
- # Node.js evolves quickly so we want to update it
- # automatically.
- package { 'nodejs':
- ensure => latest,
- }
+ # qunit tests depends on curl
+ package { [
+ 'curl',
+ ]:
+ ensure => present,
+ }
- # qunit tests depends on curl
- package { [
- 'curl',
- ]: ensure => present,
- }
+ # Colordiff gives us nice coloring in Jenkins console whenever
+ # it is used instead of the stock diff.
+ package { 'colordiff':
+ ensure => present,
+ }
+ # Uninstalled packages
+ package { [
+ 'php-apc',
+ ]: ensure => absent,
+ }
- # Colordiff gives us nice coloring in Jenkins console whenever
- # it is used instead of the stock diff.
- package { 'colordiff':
- ensure => present,
- }
-
- # Uninstalled packages
- package { [
- 'php-apc',
- ]: ensure => absent,
- }
-
- # Packages to support use of rspec on puppet modules:
- package { [
+ # Packages to support use of rspec on puppet modules:
+ package { [
# Packages imported from Debian Sid:
# Most of these would be pulled in via dependencies
# from ruby-rspec but I'm enumerating them here as a note
# that the standard ubuntu versions are insufficient.
- 'rubygems-integration',
- 'ruby-metaclass',
- 'ruby-rspec-mocks',
- 'ruby-rspec-expectations',
- 'ruby-mocha',
- 'ruby-rspec',
- 'ruby-rspec-core',
+ 'rubygems-integration',
+ 'ruby-metaclass',
+ 'ruby-rspec-mocks',
+ 'ruby-rspec-expectations',
+ 'ruby-mocha',
+ 'ruby-rspec',
+ 'ruby-rspec-core',
# Packages built using gem2deb:
- 'ruby-rspec-puppet',
- 'ruby-puppetlabs-spec-helper',
- ]:
- ensure => present;
- }
+ 'ruby-rspec-puppet',
+ 'ruby-puppetlabs-spec-helper',
+ ]:
+ ensure => present;
+ }
- package { [
- 'djvulibre-bin',
- ]: ensure => present;
- }
-
+ package { [
+ 'djvulibre-bin',
+ ]:
+ ensure => present;
+ }
}
class contint::packages::ant18 {
- if ($::lsbdistcodename == "lucid") {
- # When specifying 'latest' for package 'ant' on Lucid it will
actually
- # install ant1.7 which might not be the version we want. This
is similar to
- # the various gcc version packaged in Debian, albeit ant1.7 and
ant1.8 are
- # conflicting with each others.
- # Thus, this let us explicitly install ant version 1.8
- package { [
- "ant1.8"
- ]: ensure => installed;
- }
- package { [
- "ant",
- "ant1.7"
- ]: ensure => absent;
- }
- } else {
- # Ubuntu post Lucid ship by default with ant 1.8 or later
- package { ["ant"]: ensure => installed; }
- }
+ if ($::lsbdistcodename == 'lucid') {
+ # When specifying 'latest' for package 'ant' on Lucid it will actually
+ # install ant1.7 which might not be the version we want. This is
similar to
+ # the various gcc version packaged in Debian, albeit ant1.7 and ant1.8
are
+ # conflicting with each others.
+ # Thus, this let us explicitly install ant version 1.8
+ package { [
+ 'ant1.8'
+ ]:
+ ensure => installed,
+ }
+ package { [
+ 'ant',
+ 'ant1.7'
+ ]:
+ ensure => absent,
+ }
+ } else {
+ # Ubuntu post Lucid ship by default with ant 1.8 or later
+ package { ['ant']:
+ ensure => installed,
+ }
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/107347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21aac322abc1afb228e0cf1f69ec2dd3ef6e0339
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
