[MediaWiki-commits] [Gerrit] puppet-merge: auto-run conftool-merge - change (operations/puppet)

2016-01-14 Thread Ema (Code Review) 
Ema has submitted this change and it was merged.

Change subject: puppet-merge: auto-run conftool-merge
..


puppet-merge: auto-run conftool-merge

Since conftool-merge is the tool we're using to sync the conftool-data
git repo with what is in the datastore, it should run with every
puppet-merge.

Change-Id: Idfd881ea0bb1fdb8a00dcba5f7744fc583247f30
---
M modules/puppetmaster/files/puppet-merge
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/modules/puppetmaster/files/puppet-merge 
b/modules/puppetmaster/files/puppet-merge
index 2816eff..f076f12 100755
--- a/modules/puppetmaster/files/puppet-merge
+++ b/modules/puppetmaster/files/puppet-merge
@@ -19,6 +19,8 @@
 If the changes are acceptable, HEAD will be fast-forwarded
 to FETCH_HEAD.
 
+It also runs the conftool merge if necessary.
+
  defaults to /var/lib/git/operations/puppet
 
 "
@@ -111,6 +113,8 @@
 
 echo "HEAD is now $(git rev-parse HEAD)."
 cd -
+echo "Now running conftool-merge to sync any changes to conftool data"
+/usr/local/bin/conftool-merge
 exit 0
 else
 echo "Aborting merge."

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idfd881ea0bb1fdb8a00dcba5f7744fc583247f30
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] puppet-merge: auto-run conftool-merge - change (operations/puppet)

2016-01-13 Thread Giuseppe Lavagetto (Code Review) 
Giuseppe Lavagetto has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/263821

Change subject: puppet-merge: auto-run conftool-merge
..

puppet-merge: auto-run conftool-merge

Since conftool-merge is the tool we're using to sync the conftool-data
git repo with what is in the datastore, it should run with every
puppet-merge.

Change-Id: Idfd881ea0bb1fdb8a00dcba5f7744fc583247f30
---
M modules/puppetmaster/files/puppet-merge
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/263821/1

diff --git a/modules/puppetmaster/files/puppet-merge 
b/modules/puppetmaster/files/puppet-merge
index 2816eff..f076f12 100755
--- a/modules/puppetmaster/files/puppet-merge
+++ b/modules/puppetmaster/files/puppet-merge
@@ -19,6 +19,8 @@
 If the changes are acceptable, HEAD will be fast-forwarded
 to FETCH_HEAD.
 
+It also runs the conftool merge if necessary.
+
  defaults to /var/lib/git/operations/puppet
 
 "
@@ -111,6 +113,8 @@
 
 echo "HEAD is now $(git rev-parse HEAD)."
 cd -
+echo "Now running conftool-merge to sync any changes to conftool data"
+/usr/local/bin/conftool-merge
 exit 0
 else
 echo "Aborting merge."

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idfd881ea0bb1fdb8a00dcba5f7744fc583247f30
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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