From 8966e888518e14826478d27ef9b7517053ab2987 Mon Sep 17 00:00:00 2001
From: Dean Troyer <dtroyer@gmail.com>
Date: Fri, 10 Aug 2018 13:28:48 -0500
Subject: [PATCH] Correctly push tags to Gerrit

The tags were missing from the branch push to Gerrit.  Also, tags
pushed to Gerrit must be signed, so gpg and git must both be
properly configured for this to run now.

Change-Id: I97f3a4364f090e1b42ac0fc2ba7554c164013345
Signed-off-by: Dean Troyer <dtroyer@gmail.com>
---
 release/branch-stx.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/release/branch-stx.sh b/release/branch-stx.sh
index 734bd567..b4f53184 100755
--- a/release/branch-stx.sh
+++ b/release/branch-stx.sh
@@ -91,7 +91,7 @@ function branch_repo {
     fi
 
     # tag branch point at $sha
-    git tag -f $tag $sha
+    git tag -s -m "Branch $branch" -f $tag $sha
 
     # Push the new goodness back up
     if [[ "$r" == "starlingx" ]]; then
@@ -102,7 +102,7 @@ function branch_repo {
 
         # push
         if [[ -z $DRY_RUN ]]; then
-            git push gerrit $branch
+            git push --tags gerrit $branch
         else
             echo "### skipping push to $branch"
         fi