Filippo Giunchedi has submitted this change and it was merged.
Change subject: zuul: python-statsd has been packaged
......................................................................
zuul: python-statsd has been packaged
I had a hack in zuul::init which edited the dependency file in Zuul
source code to remove the 'statsd' dependency. This is no more needed
since the python module has been packaged months ago.
Moreover, the file tools/pip-requires does not exist anymore in upstream
code.
Change-Id: I7b088775a6a08d75e5ac5c0639ec0994be192c99
---
M modules/zuul/manifests/init.pp
1 file changed, 0 insertions(+), 10 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 56692a1..81386a0 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -78,15 +78,6 @@
branch => $git_branch,
}
- # We do not ship `statsd` python module so ignore it
- # it is gracefully ignored by Zuul.
- exec { 'remove_statsd_dependency':
- command => '/bin/sed -i "s/^statsd/#statsd/" tools/pip-requires',
- cwd => $zuul_source_dir,
- refreshonly => true,
- subscribe => Git::Clone['integration/zuul'],
- }
-
exec { 'install_zuul':
# Make sure to install without downloading from pypi
command => 'python setup.py easy_install --allow-hosts=None .',
@@ -95,7 +86,6 @@
refreshonly => true,
subscribe => Git::Clone['integration/zuul'],
require => [
- Exec['remove_statsd_dependency'],
Package['python-setuptools'],
],
}
--
To view, visit https://gerrit.wikimedia.org/r/141442
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7b088775a6a08d75e5ac5c0639ec0994be192c99
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
