Alexandros Kosiaris has uploaded a new change for review.
https://gerrit.wikimedia.org/r/310854
Change subject: puppet-merge: One more typo fix
......................................................................
puppet-merge: One more typo fix
$sha1 => $fetch_head_sha1 in one more place
Change-Id: Ia1c18a7ae796502ccad0ff8dbd847d37ba30771a
---
M modules/puppetmaster/templates/puppet-merge.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/54/310854/1
diff --git a/modules/puppetmaster/templates/puppet-merge.erb
b/modules/puppetmaster/templates/puppet-merge.erb
index 3e588f2..1ae9a49 100755
--- a/modules/puppetmaster/templates/puppet-merge.erb
+++ b/modules/puppetmaster/templates/puppet-merge.erb
@@ -187,7 +187,7 @@
if [ $running_user = $git_user ]; then
ssh -t -t <%= worker -%> true ${fetch_head_sha1} 2>&1 | tee -a
/var/log/puppet-post-merge.log
else
- su - $git_user -c "ssh -t -t <%= worker -%> true ${sha1} 2>&1 | tee -a
/var/log/puppet-post-merge.log"
+ su - $git_user -c "ssh -t -t <%= worker -%> true ${fetch_head_sha1} 2>&1 |
tee -a /var/log/puppet-post-merge.log"
fi
if [ $? -eq 0 ]; then
echo "${GREEN}OK${RESET}: puppet-merge on <%= worker %> succeded"
--
To view, visit https://gerrit.wikimedia.org/r/310854
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1c18a7ae796502ccad0ff8dbd847d37ba30771a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
