Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/226711
Change subject: contint::packages: factor c::p::python out
......................................................................
contint::packages: factor c::p::python out
We want to factor a few functionality out of the contint::packages::labs
as having that all inside one single class could make it harder to have
dedicated slaves that are simpler to build.
Change-Id: I3949a7e65c662d2c800965fb8d7c895bac0194e6
---
M modules/contint/manifests/packages/labs.pp
A modules/contint/manifests/packages/python.pp
2 files changed, 30 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/11/226711/1
diff --git a/modules/contint/manifests/packages/labs.pp
b/modules/contint/manifests/packages/labs.pp
index 00025eb..1fc3292 100644
--- a/modules/contint/manifests/packages/labs.pp
+++ b/modules/contint/manifests/packages/labs.pp
@@ -9,6 +9,9 @@
# Fonts needed for browser tests screenshots (T71535)
include mediawiki::packages::fonts
+ # Required for python testing
+ include ::contint::packages::python
+
class { 'apt::unattendedupgrades':
ensure => absent,
}
@@ -78,17 +81,6 @@
package { [
'npm',
-
- # Let us compile python modules:
- 'python-dev',
- 'libmysqlclient-dev', # For python SQLAlchemy
-
- 'libxml2-dev', # For python lxml
- 'libxslt1-dev', # For python lxml
- 'libffi-dev', # For python requests[security]
-
- 'python3-tk', # For pywikibot/core running tox-doc-trusty
-
# For
mediawiki/extensions/Collection/OfflineContentGenerator/latex_renderer
# Provided by openstack::common:
#'unzip',
@@ -102,17 +94,6 @@
# For mediawiki/extensions/Collection/OfflineContentGenerator/bundler
ensure_packages(['zip'])
- # Also provided by Zuul installation
- ensure_packages(['python-pip'])
-
- # Bring tox/virtualenv... from pip T46443
- # TODO: Reevaluate this once we switch to trusty. Maybe provider being apt
- # would be better then
- package { 'tox':
- ensure => '1.9.2',
- provider => 'pip',
- require => Package['python-pip'],
- }
if os_version('ubuntu >= trusty') {
exec { '/usr/bin/apt-get -y build-dep hhvm':
@@ -130,10 +111,6 @@
}
package { [
- 'python3.4',
- # Let us compile python modules:
- 'python3.4-dev',
-
'ruby2.0',
# bundle/gem compile ruby modules:
'ruby2.0-dev',
diff --git a/modules/contint/manifests/packages/python.pp
b/modules/contint/manifests/packages/python.pp
new file mode 100644
index 0000000..c8ff5a0
--- /dev/null
+++ b/modules/contint/manifests/packages/python.pp
@@ -0,0 +1,27 @@
+# === Class contint::packages::python
+#
+# This class sets up packages needed for general python testing
+#
+class contint::packages::python {
+ require_package( # Let us compile python modules:
+ 'python-dev',
+ 'python-pip',
+ 'libmysqlclient-dev', # For python SQLAlchemy
+ 'libxml2-dev', # For python lxml
+ 'libxslt1-dev', # For python lxml
+ 'libffi-dev', # For python requests[security]
+ )
+ # Bring tox/virtualenv... from pip T46443
+ package { 'tox':
+ ensure => '1.9.2',
+ provider => 'pip',
+ require => Package['python-pip'],
+ }
+
+ # Python 3
+ require_package(
+ 'python3',
+ 'python3-dev',
+ 'python3-tk', # For pywikibot/core running tox-doc-trusty
+ )
+}
--
To view, visit https://gerrit.wikimedia.org/r/226711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3949a7e65c662d2c800965fb8d7c895bac0194e6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
