jenkins-bot has submitted this change and it was merged.
Change subject: Make Git::Clone take an optional 'branch' parameter
......................................................................
Make Git::Clone take an optional 'branch' parameter
This allows a specific branch of Mediawiki to be checked out.
The parameter is set to 'master' by default.
Change-Id: I54e334eed28d15b86df53892d96718061c8d68f4
---
M puppet/modules/git/manifests/clone.pp
M puppet/modules/mediawiki/manifests/init.pp
2 files changed, 14 insertions(+), 2 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/git/manifests/clone.pp
b/puppet/modules/git/manifests/clone.pp
index 291cc7a..e1d5036 100644
--- a/puppet/modules/git/manifests/clone.pp
+++ b/puppet/modules/git/manifests/clone.pp
@@ -8,6 +8,9 @@
# Name for target directory for repository content. It should not
# refer to an existing directory.
#
+# [*branch*]
+# Name of branch to check out. Defaults to 'master'.
+#
# [*remote*]
# Remote URL for the repository. If unspecified, the resource title
# will be interpolated into $git::urlformat.
@@ -20,7 +23,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 +36,7 @@
}
exec { "git clone ${title}":
- command => "git clone --recursive ${url} ${directory}",
+ command => "git clone --recursive --branch ${branch} ${url}
${directory}",
creates => "${directory}/.git",
require => Package['git'],
user => 'vagrant',
diff --git a/puppet/modules/mediawiki/manifests/init.pp
b/puppet/modules/mediawiki/manifests/init.pp
index 68c8611..f272b4e 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').
@@ -48,6 +51,7 @@
$dir,
$settings_dir,
$upload_dir,
+ $branch = undef,
$server_url = undef,
) {
Exec { environment => "MW_INSTALL_PATH=${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: merged
Gerrit-Change-Id: I54e334eed28d15b86df53892d96718061c8d68f4
Gerrit-PatchSet: 7
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Adamw <[email protected]>
Gerrit-Reviewer: Adamw <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
