From 0e62742348ecd692bc573ada36c65b3ba1a8b6ce Mon Sep 17 00:00:00 2001
From: Fabian Deutsch <fabiand@fedoraproject.org>
Date: Wed, 4 Jul 2018 17:43:18 +0200
Subject: [PATCH] hack: Update release script and mailMap

Signed-off-by: Fabian Deutsch <fabiand@fedoraproject.org>
---
 .mailmap                 |  4 ++++
 hack/release-announce.sh | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.mailmap b/.mailmap
index d273b0e9067f..de9c2dd5274e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -13,3 +13,7 @@ Yuval Lifshitz <ylifshit@redhat.com> <yuvalif@yahoo.com>
 Marc Sluiter <msluiter@redhat.com> <marc@slintes.net>
 Sebastian Scheinkman <sscheink@redhat.com> <sebassch@gmail.com>
 Ihar Hrachyshka <ihar@redhat.com> <ihar.hrachyshka@gmail.com>
+Tzvi Avni <tavni@redhat.com> <root@tavni.tlv.csb>
+Tzvi Avni <tavni@redhat.com> <tavni@tavni.tlv.csb>
+Tzvi Avni <tavni@redhat.com> <tavni@redhat.com>
+Ryan Hallisey <rhallise@redhat.com> <rhallisey@localhost.localdomain>
diff --git a/hack/release-announce.sh b/hack/release-announce.sh
index e4e6b33c4bcd..57cbc66b1bdc 100755
--- a/hack/release-announce.sh
+++ b/hack/release-announce.sh
@@ -27,7 +27,7 @@ summary() {
 downloads() {
     log "Adding download urls"
     local GHRELURL="https://github.com/kubevirt/kubevirt/releases/tag/"
-    local RELURL="$GHRELURL$RELREF"
+    local RELURL="$GHRELURL$FUTURERELREF"
     cat <<EOF
 The source code and selected binaries are available for download at:
 <$RELURL>.
@@ -53,13 +53,14 @@ functest() {
 }
 
 usage() {
-    echo "Usage: $0 [RELEASE_REF] [PREV_RELEASE_REF]"
+    echo "Usage: $0 [FUTURE_RELEASE_REF] [PREV_RELEASE_REF]"
 }
 
 main() {
     log "Span: $RELSPANREF"
 
     fold -s <<EOF | tee release-announce
+---
 $(summary)
 
 $(downloads)
@@ -95,13 +96,16 @@ Additional Resources
 [git-evtag]: https://github.com/cgwalters/git-evtag#using-git-evtag
 [contributing]: https://github.com/kubevirt/kubevirt/blob/master/CONTRIBUTING.md
 [license]: https://github.com/kubevirt/kubevirt/blob/master/LICENSE
+---
+git evtag sign $FUTURERELREF
 EOF
 }
 
 #
 # Let's get the party started
 #
-RELREF="$1"
+FUTURERELREF="$1"
+RELREF="HEAD"
 PREREF="$2"
 RELREF=${RELREF:-$(git describe --abbrev=0 --tags)}
 PREREF=${PREREF:-$(git describe --abbrev=0 --tags $RELREF^)}