Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/95715
Change subject: Mediawiki can be checked out on a branch
......................................................................
Mediawiki can be checked out on a branch
Change-Id: I54e334eed28d15b86df53892d96718061c8d68f4
---
M puppet/modules/git/manifests/clone.pp
M puppet/modules/mediawiki/manifests/init.pp
2 files changed, 11 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/15/95715/1
diff --git a/puppet/modules/git/manifests/clone.pp
b/puppet/modules/git/manifests/clone.pp
index cca0e35..85a811a 100644
--- a/puppet/modules/git/manifests/clone.pp
+++ b/puppet/modules/git/manifests/clone.pp
@@ -20,7 +20,11 @@
# directory => '/vagrant/mediawiki/extensions/VisualEditor',
# }
#
-define git::clone($directory, $remote=undef) {
+define git::clone(
+ $directory,
+ $branch = 'master',
+ $remote=undef,
+) {
include git
$url = $remote ? {
@@ -29,7 +33,7 @@
}
exec { "git clone ${title}":
- command => "git clone --recursive ${url} ${directory}",
+ command => "git clone --recursive -b ${branch} ${url}
${directory}",
creates => "${directory}/.git/refs/remotes",
require => Package['git'],
user => 'vagrant',
diff --git a/puppet/modules/mediawiki/manifests/init.pp
b/puppet/modules/mediawiki/manifests/init.pp
index 68c8611..8db3d08 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -23,6 +23,9 @@
# [*db_pass*]
# Password for MySQL account (example: 'secret123').
#
+# [*branch*]
+# Version to check out
+#
# [*dir*]
# The system path to which MediaWiki files have been installed
# (example: '/srv/mediawiki').
@@ -45,6 +48,7 @@
$db_name,
$db_pass,
$db_user,
+ $branch,
$dir,
$settings_dir,
$upload_dir,
@@ -70,6 +74,7 @@
@git::clone { 'mediawiki/core':
directory => $dir,
+ branch => $branch,
}
# If an auto-generated LocalSettings.php file exists but the database it
--
To view, visit https://gerrit.wikimedia.org/r/95715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I54e334eed28d15b86df53892d96718061c8d68f4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Adamw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
