From 3d24b815b6951b330060cecf44a23bfb4f57413d Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Mon, 10 Dec 2018 15:48:28 +0100
Subject: [PATCH] tools/newtag.sh: added branch parameter

Change-Id: I87c0e522148e2ce095605f2e903a63be6ae6bc81
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
 tools/newtag.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/tools/newtag.sh b/tools/newtag.sh
index 62cef0c5..097a46f5 100755
--- a/tools/newtag.sh
+++ b/tools/newtag.sh
@@ -1,14 +1,15 @@
 #!/bin/bash
-if [ $# -ne 4 ]; then
-    echo "Usage $0 <repo> <tag> <user> <release_name>"
-    echo "Example: $0 all v4.0.2 garciadeblas FOUR"
-    echo "Example: $0 devops v4.0.3 marchettim FIVE"
+if [ $# -ne 5 ]; then
+    echo "Usage $0 <repo> <branch> <tag> <user> <release_name>"
+    echo "Example: $0 all master v4.0.2 garciadeblas FOUR"
+    echo "Example: $0 devops v5.0 v5.0.3 marchettim FIVE"
     exit 1
 fi
 
-TAG="$2"
-USER="$3"
-RELEASE_NAME="$4"
+BRANCH="$2"
+TAG="$3"
+USER="$4"
+RELEASE_NAME="$5"
 tag_header="OSM Release $RELEASE_NAME:"
 tag_message="$tag_header version $TAG"
 
@@ -33,7 +34,7 @@ for i in $list; do
     if [ ! -d $i ]; then
         git clone ssh://$USER@osm.etsi.org:29418/osm/$i
     fi
-    git -C $i checkout master
+    git -C $i checkout $BRANCH
     git -C $i pull --rebase
     git -C $i tag -a $TAG -m"$tag_message"
     git -C $i push origin $TAG --follow-tags
-- 
2.25.1