Dzahn has submitted this change and it was merged.
Change subject: monitoring: Remove alerts for 0 unmerged changes
......................................................................
monitoring: Remove alerts for 0 unmerged changes
bug: T99001
Change-Id: I079c3d941f17061b06e1dcd376e78c0e2a2e0342
---
M modules/monitoring/templates/check_git-needs-merge.erb
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/monitoring/templates/check_git-needs-merge.erb
b/modules/monitoring/templates/check_git-needs-merge.erb
index d34a687..ca73618 100755
--- a/modules/monitoring/templates/check_git-needs-merge.erb
+++ b/modules/monitoring/templates/check_git-needs-merge.erb
@@ -20,6 +20,9 @@
outstanding=$(git log HEAD..${refname} --oneline | wc -l)
if [ $outstanding -eq 1 ]; then
msg_start="There is one unmerged change"
+elif [ $outstanding -eq 0 ]; then
+ echo "No changes to merge."
+ exit 0
else
msg_start="There are ${outstanding} unmerged changes"
fi;
--
To view, visit https://gerrit.wikimedia.org/r/218315
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I079c3d941f17061b06e1dcd376e78c0e2a2e0342
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <[email protected]>
Gerrit-Reviewer: Alex Monk <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Matanya <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
