jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/371502 )
Change subject: Switch to git from jessie-backports
......................................................................
Switch to git from jessie-backports
We have been using an Ubuntu PPA to get less ancient git binaries since
we were on the Trusty base image. This was most recently installing
a 2.13.0 version of git. The hacks to use a PPA on Jessie are fragile
and the more robust jessie-backports apt repo has version 2.11.0 which
is new enough.
This change will not alter the installed git version on any existing VM.
Change-Id: I476928e95bd808072208144d1284995bda6906b2
---
M puppet/modules/git/manifests/init.pp
1 file changed, 12 insertions(+), 4 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/git/manifests/init.pp
b/puppet/modules/git/manifests/init.pp
index 7163aa3..acc39e5 100644
--- a/puppet/modules/git/manifests/init.pp
+++ b/puppet/modules/git/manifests/init.pp
@@ -28,11 +28,19 @@
) {
include ::git::gerrit
- apt::ppa { 'git-core/ppa': }
+ $packages = [
+ 'git',
+ 'git-man',
+ ]
+ apt::pin { 'git':
+ package => join(sort($packages), ' '),
+ pin => 'release a=jessie-backports',
+ priority => '1001',
+ }
- package { 'git':
- ensure => latest,
- require => Apt::Ppa['git-core/ppa'],
+ package { $packages:
+ ensure => 'present',
+ require => Apt::Pin['git'],
}
package { 'git-review':
--
To view, visit https://gerrit.wikimedia.org/r/371502
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I476928e95bd808072208144d1284995bda6906b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: BryanDavis <bda...@wikimedia.org>
Gerrit-Reviewer: Dduvall <dduv...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
