[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Clone only the master branch of mediawiki/core.git by default

2017-02-24 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/328335 )

Change subject: Clone only the master branch of mediawiki/core.git by default
..


Clone only the master branch of mediawiki/core.git by default

We've been seeing some issues with bad commit references causing the
initial git clone of MediaWiki to fail. Various debugging attempts point
to commits on deployment branches that may have somehow been lost in the
origin repo. Normal MediaWiki development happens on the master branch
and not a release branch, so we can work around this issue by limiting
the initial clone to a single branch.

Bug: T152801
Change-Id: I4939712110c0ac9286b668ca7a4f86440fb28e4f
---
M puppet/hieradata/common.yaml
M puppet/modules/git/manifests/clone.pp
M puppet/modules/mediawiki/manifests/init.pp
3 files changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Krinkle: Looks good to me, but someone else must approve
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 4bf4a2a..a8f40f3 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -236,6 +236,7 @@
 mediawiki::admin_user: Admin
 mediawiki::admin_pass: vagrant
 mediawiki::server_url: 
"http://%{hiera('role::mediawiki::hostname')}%{::port_fragment}"
+mediawiki::branch: master
 
 mediawiki::apache::docroot: "%{hiera('apache::docroot')}"
 mediawiki::apache::php5_site_name: "php5%{hiera('mwv::tld')}"
diff --git a/puppet/modules/git/manifests/clone.pp 
b/puppet/modules/git/manifests/clone.pp
index b2c6334..c82ca52 100644
--- a/puppet/modules/git/manifests/clone.pp
+++ b/puppet/modules/git/manifests/clone.pp
@@ -67,7 +67,7 @@
 
 $arg_branch = $branch ? {
 undef   => '',
-default => "--branch '${branch}'"
+default => "--branch '${branch}' --single-branch"
 }
 $arg_recurse = $recurse_submodules ? {
 true=> '--recurse-submodules',
diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index e94d439..8f1f739 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -39,7 +39,7 @@
 #   pages is stored (example: '/srv/pages').
 #
 # [*branch*]
-#   Version to check out
+#   Branch to check out (example: 'master').
 #
 # [*git_depth*]
 #  Git cloning depth - undef for normal, a number for a shallow clone with

-- 
To view, visit https://gerrit.wikimedia.org/r/328335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4939712110c0ac9286b668ca7a4f86440fb28e4f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Clone only the master branch of mediawiki/core.git by default

2016-12-19 Thread BryanDavis (Code Review) 
BryanDavis has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/328335 )

Change subject: Clone only the master branch of mediawiki/core.git by default
..

Clone only the master branch of mediawiki/core.git by default

We've been seeing some issues with bad commit references causing the
initial git clone of MediaWiki to fail. Various debugging attempts point
to commits on deployment branches that may have somehow been lost in the
origin repo. Normal MediaWiki development happens on the master branch
and not a release branch, so we can work around this issue by limiting
the initial clone to a single branch.

Bug: T152801
Change-Id: I4939712110c0ac9286b668ca7a4f86440fb28e4f
---
M puppet/modules/git/manifests/clone.pp
M puppet/modules/mediawiki/manifests/init.pp
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/35/328335/1

diff --git a/puppet/modules/git/manifests/clone.pp 
b/puppet/modules/git/manifests/clone.pp
index b2c6334..c82ca52 100644
--- a/puppet/modules/git/manifests/clone.pp
+++ b/puppet/modules/git/manifests/clone.pp
@@ -67,7 +67,7 @@
 
 $arg_branch = $branch ? {
 undef   => '',
-default => "--branch '${branch}'"
+default => "--branch '${branch}' --single-branch"
 }
 $arg_recurse = $recurse_submodules ? {
 true=> '--recurse-submodules',
diff --git a/puppet/modules/mediawiki/manifests/init.pp 
b/puppet/modules/mediawiki/manifests/init.pp
index 15cfc3b..b0df80a 100644
--- a/puppet/modules/mediawiki/manifests/init.pp
+++ b/puppet/modules/mediawiki/manifests/init.pp
@@ -55,7 +55,7 @@
 $upload_dir,
 $page_dir,
 $composer_fragment_dir,
-$branch = undef,
+$branch = 'master',
 $server_url = undef,
 ) {
 Exec {

-- 
To view, visit https://gerrit.wikimedia.org/r/328335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4939712110c0ac9286b668ca7a4f86440fb28e4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits