Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/71165
Change subject: Set $HOME when git-cloning
......................................................................
Set $HOME when git-cloning
As of git 1.8.1.1 and above, if the home directory can't be accessed, it
results in a fatal error. This becomes a problem if we sudo -u vagrant
git-clone, because sudo does not set $HOME and the vagrant user tries to
read/write /root/.config (which fails).
Bug: 50143
Change-Id: If6a066d0f077e0ea37ef0031ae8a901d3e1b3513
---
M puppet/modules/browsertests/manifests/init.pp
M puppet/modules/git/manifests/clone.pp
2 files changed, 12 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/65/71165/1
diff --git a/puppet/modules/browsertests/manifests/init.pp
b/puppet/modules/browsertests/manifests/init.pp
index bc4414c..99df494 100644
--- a/puppet/modules/browsertests/manifests/init.pp
+++ b/puppet/modules/browsertests/manifests/init.pp
@@ -72,9 +72,11 @@
}
exec { 'bundle install':
- cwd => '/srv/browsertests',
- unless => 'bundle check',
- require => [ Exec['use ruby 1.9.1'],
Git::Clone['qa/browsertests'] ],
- timeout => 0,
+ cwd => '/srv/browsertests',
+ user => 'vagrant',
+ environment => 'HOME=/user/vagrant',
+ unless => 'bundle check',
+ require => [ Exec['use ruby 1.9.1'],
Git::Clone['qa/browsertests'] ],
+ timeout => 0,
}
}
diff --git a/puppet/modules/git/manifests/clone.pp
b/puppet/modules/git/manifests/clone.pp
index da9b2a2..86f66b0 100644
--- a/puppet/modules/git/manifests/clone.pp
+++ b/puppet/modules/git/manifests/clone.pp
@@ -32,10 +32,11 @@
}
exec { "git clone ${title}":
- command => "git clone ${url} ${directory}",
- creates => "${directory}/.git/refs/remotes",
- require => Package['git'],
- user => $user,
- timeout => 0,
+ command => "git clone ${url} ${directory}",
+ creates => "${directory}/.git/refs/remotes",
+ require => Package['git'],
+ user => $user,
+ environment => "HOME=/home/$user",
+ timeout => 0,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/71165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If6a066d0f077e0ea37ef0031ae8a901d3e1b3513
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
