diff --git a/puppet/zulip/files/hooks/common/zulip_notify.sh b/puppet/zulip/files/hooks/common/zulip_notify.sh index ccb9ad3297..1ec78b9953 100644 --- a/puppet/zulip/files/hooks/common/zulip_notify.sh +++ b/puppet/zulip/files/hooks/common/zulip_notify.sh @@ -26,8 +26,9 @@ fi from=${ZULIP_OLD_MERGE_BASE_COMMIT:-$ZULIP_OLD_VERSION} to=${ZULIP_NEW_MERGE_BASE_COMMIT:-$ZULIP_NEW_VERSION} deploy_environment=$(crudini --get /etc/zulip/zulip.conf machine deploy_type || echo "development") +commit_count=$(git rev-list "${from}..${to}" | wc -l) -echo "zulip_notify: Sending notify of $from .. $to for $deploy_environment to $zulip_notify_server" +echo "zulip_notify: Sending notify of $from .. $to ($commit_count commits) for $deploy_environment to $zulip_notify_server" zulip_send() { ./zulip-py3-venv/bin/zulip-send \ diff --git a/puppet/zulip/files/hooks/post-deploy.d/zulip_notify.hook b/puppet/zulip/files/hooks/post-deploy.d/zulip_notify.hook index 04a20acda6..9e1977451f 100644 --- a/puppet/zulip/files/hooks/post-deploy.d/zulip_notify.hook +++ b/puppet/zulip/files/hooks/post-deploy.d/zulip_notify.hook @@ -4,4 +4,5 @@ set -e set -u source "$(dirname "$0")/../common/zulip_notify.sh" -zulip_send "Finished deploying from $from to $to on $(hostname)" + +zulip_send "Finished ${deploy_environment} deploy of [${commit_count} new commits](https://github.com/zulip/zulip/compare/${from}...${to}) on $(hostname)" diff --git a/puppet/zulip/files/hooks/pre-deploy.d/zulip_notify.hook b/puppet/zulip/files/hooks/pre-deploy.d/zulip_notify.hook index ced80f4ec0..c5f24829d6 100644 --- a/puppet/zulip/files/hooks/pre-deploy.d/zulip_notify.hook +++ b/puppet/zulip/files/hooks/pre-deploy.d/zulip_notify.hook @@ -4,4 +4,5 @@ set -e set -u source "$(dirname "$0")/../common/zulip_notify.sh" -zulip_send "Starting deploy from $from to $to on $(hostname)" + +zulip_send "Starting ${deploy_environment} deploy of [${commit_count} new commits](https://github.com/zulip/zulip/compare/${from}...${to}) on $(hostname)"