BryanDavis has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394823 )
Change subject: Replace libmysqlclient-dev with default-libmysqlclient-dev
......................................................................
Replace libmysqlclient-dev with default-libmysqlclient-dev
libmysqlclient-dev is only provided on jessie.
default-libmysqlclient-dev is provided on both jessie and stretch (and
resolves to libmysqlclient-dev or libmariadbclient-dev-compat).
Bug: T51652
Change-Id: I1a41a8bd56e612082ffafc651573e091ec836f75
(cherry picked from commit f513150385f85ad10cdc427b6f55131a6ceda615)
---
M puppet/modules/crm/manifests/tools.pp
M puppet/modules/eventlogging/manifests/init.pp
M puppet/modules/role/manifests/striker.pp
M puppet/modules/sentry/manifests/init.pp
4 files changed, 7 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/23/394823/1
diff --git a/puppet/modules/crm/manifests/tools.pp
b/puppet/modules/crm/manifests/tools.pp
index 6d70d79..17c7aab 100644
--- a/puppet/modules/crm/manifests/tools.pp
+++ b/puppet/modules/crm/manifests/tools.pp
@@ -15,7 +15,7 @@
$audit_base = '/var/spool/audit'
require_package(
- 'libmysqlclient-dev',
+ 'default-libmysqlclient-dev',
'libyaml-dev'
)
@@ -50,7 +50,7 @@
command => "pip install -r ${dir}/requirements.txt",
require => [
Git::Clone['wikimedia/fundraising/tools'],
- Package['libmysqlclient-dev'],
+ Package['default-libmysqlclient-dev'],
Package['libyaml-dev'],
],
}
diff --git a/puppet/modules/eventlogging/manifests/init.pp
b/puppet/modules/eventlogging/manifests/init.pp
index d04985e..d205fbc 100644
--- a/puppet/modules/eventlogging/manifests/init.pp
+++ b/puppet/modules/eventlogging/manifests/init.pp
@@ -15,7 +15,7 @@
require => Git::Clone['eventlogging'],
}
- require_package('libmysqlclient-dev')
+ require_package('default-libmysqlclient-dev')
require_package('librdkafka-dev')
# Do the initial pip install into the virtualenv
@@ -25,7 +25,7 @@
creates =>
"${path}/virtualenv/local/lib/python2.7/site-packages/eventlogging.egg-link",
require => [
Service::Gitupdate['eventlogging'],
- Package['libmysqlclient-dev'],
+ Package['default-libmysqlclient-dev'],
Package['librdkafka-dev']
],
}
diff --git a/puppet/modules/role/manifests/striker.pp
b/puppet/modules/role/manifests/striker.pp
index 8fe839a..bc1965c 100644
--- a/puppet/modules/role/manifests/striker.pp
+++ b/puppet/modules/role/manifests/striker.pp
@@ -126,7 +126,7 @@
require_package(
'libffi-dev',
'libldap2-dev',
- 'libmysqlclient-dev',
+ 'default-libmysqlclient-dev',
'libsasl2-dev',
'libssl-dev',
$python,
diff --git a/puppet/modules/sentry/manifests/init.pp
b/puppet/modules/sentry/manifests/init.pp
index fd85a72..882ce9a 100644
--- a/puppet/modules/sentry/manifests/init.pp
+++ b/puppet/modules/sentry/manifests/init.pp
@@ -69,7 +69,7 @@
require ::virtualenv
#
http://stackoverflow.com/questions/5178292/pip-install-mysql-python-fails-with-environmenterror-mysql-config-not-found
- require_package('libmysqlclient-dev')
+ require_package('default-libmysqlclient-dev')
# needed for building the python package lxml
require_package('libxml2-dev', 'libxslt1-dev')
# needed for building the python package cffi (?)
@@ -87,7 +87,7 @@
'sentry[mysql]==7.7.0',
'raven',
],
- require => Package['libmysqlclient-dev'],
+ require => Package['default-libmysqlclient-dev'],
timeout => 600, # This can take a while
}
--
To view, visit https://gerrit.wikimedia.org/r/394823
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a41a8bd56e612082ffafc651573e091ec836f75
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
