Hashar has uploaded a new change for review. https://gerrit.wikimedia.org/r/53422
Change subject: contint: move analytics packages to the contint module ...................................................................... contint: move analytics packages to the contint module Change-Id: Icad5ed3756ee03cc9e4d964a8741aa2d752ddc0d --- M manifests/misc/contint.pp M manifests/site.pp M modules/contint/manifests/packages.pp 3 files changed, 18 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/22/53422/1 diff --git a/manifests/misc/contint.pp b/manifests/misc/contint.pp index 100cc6c..a74b314 100644 --- a/manifests/misc/contint.pp +++ b/manifests/misc/contint.pp @@ -54,24 +54,6 @@ } } -# Includes packages needed for building -# analytics and statistics related packages. -# E.g. udp-filter, etc. -class misc::contint::analytics::packages { - # these are needed to build libanon and udp-filter - package { ["pkg-config", "libpcap-dev", "libdb-dev"]: - ensure => "installed", - } - - # 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","libweb-scraper-perl"]: - ensure => "installed", - } - # need geoip to build udp-filter - include geoip -} - # CI test server as per RT #1204 class misc::contint::test { diff --git a/manifests/site.pp b/manifests/site.pp index a512855..27854e5 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -775,7 +775,6 @@ contint::website, misc::contint::test, misc::contint::test::packages, - misc::contint::analytics::packages, misc::contint::test::jenkins, misc::contint::android::sdk, testswarm::systemuser, diff --git a/modules/contint/manifests/packages.pp b/modules/contint/manifests/packages.pp index 9ef4baf..370993c 100644 --- a/modules/contint/manifests/packages.pp +++ b/modules/contint/manifests/packages.pp @@ -64,6 +64,24 @@ ]: ensure => present, } + # 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 packages are used by the tests for wikistats to parse the + # generated reports to see if they are correct + package { ['libhtml-treebuilder-xpath-perl','libweb-scraper-perl']: + ensure => 'installed', + } + + # need geoip to build udp-filter + include geoip + + # Node.js evolves quickly so we want to update it # automatically. package { 'nodejs': -- To view, visit https://gerrit.wikimedia.org/r/53422 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icad5ed3756ee03cc9e4d964a8741aa2d752ddc0d 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