Volans has uploaded a new change for review.
https://gerrit.wikimedia.org/r/275031
Change subject: Git: add logging to post-merge hook on puppetmaster
......................................................................
Git: add logging to post-merge hook on puppetmaster
Patch intended to be able to catch the random errors that happens when
running the post-merge git hook on the puppetmaster.
If we choose to keep it a logrotate should be added to rotate the added
logfile.
Bug: T128895
Change-Id: I9bc5252ea8b8ac460cfd186a2d49fd58b578cc1e
---
M modules/puppetmaster/templates/post-merge.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/31/275031/1
diff --git a/modules/puppetmaster/templates/post-merge.erb
b/modules/puppetmaster/templates/post-merge.erb
index a2ae9ba..7e56c17 100644
--- a/modules/puppetmaster/templates/post-merge.erb
+++ b/modules/puppetmaster/templates/post-merge.erb
@@ -11,7 +11,7 @@
# on worker and ignore our command.
<%- @workers.each do |workerhash| -%>
<%- if workerhash['worker'] == @fqdn then next end -%>
- ssh -t -t <%= workerhash['worker'] -%> 'cd
/var/lib/git/operations/puppet && git fetch --verbose --update-head-ok && git
reset --hard origin/production'
+ ssh -t -t <%= workerhash['worker'] -%> 'cd
/var/lib/git/operations/puppet && git fetch --verbose --update-head-ok && git
reset --hard origin/production' 2>&1 | tee -a /var/log/puppet-post-merge.log
<%- end -%>
<%- end -%>
fi
--
To view, visit https://gerrit.wikimedia.org/r/275031
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9bc5252ea8b8ac460cfd186a2d49fd58b578cc1e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
