jenkins-bot has submitted this change and it was merged.
Change subject: Make git dependency of thumbor venv explicit
......................................................................
Make git dependency of thumbor venv explicit
Bug: T120483
Change-Id: I7d35eef4c41e8c5b874d45bcfed7b0cab57d03e8
---
M puppet/modules/thumbor/manifests/init.pp
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/thumbor/manifests/init.pp
b/puppet/modules/thumbor/manifests/init.pp
index b567146..95819a4 100644
--- a/puppet/modules/thumbor/manifests/init.pp
+++ b/puppet/modules/thumbor/manifests/init.pp
@@ -28,6 +28,8 @@
$sentry_dsn_file,
) {
require ::virtualenv
+ # Needed by the venv, which clones a few git repos
+ require ::git
# jpegtran
require_package('libjpeg-progs')
@@ -62,6 +64,8 @@
require => [
Package['libjpeg-progs'],
Package['python-opencv'],
+ # Needs to be an explicit dependency, for the packages pointing to
git repos
+ Package['git'],
],
timeout => 600, # This venv can be particularly long to download and
setup
}
--
To view, visit https://gerrit.wikimedia.org/r/257175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7d35eef4c41e8c5b874d45bcfed7b0cab57d03e8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
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
