X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=tools%2Fnewtag.sh;h=124c261078be3ed1dbbe33548759817a1fd133ee;hb=796aafb2e62ae461458cf4135c0342b3b7d1a3a1;hp=78cd4bba45963e46cc7bd07bf32216be95c791f5;hpb=7942e2818b950a5e17bf97039aaea9afce58967e;p=osm%2Fdevops.git

diff --git a/tools/newtag.sh b/tools/newtag.sh
index 78cd4bba..124c2610 100755
--- a/tools/newtag.sh
+++ b/tools/newtag.sh
@@ -1,15 +1,14 @@
 #!/bin/bash
-if [ $# -ne 2 ]; then
-    echo "Usage $0 <repo> <tag>"
+if [ $# -ne 3 ]; then
+    echo "Usage $0 <repo> <tag> <user>"
     exit 1
 fi
 
-CURRENT_BRANCH="v2.0"
+USER=$3
 TAG="$2"
-tag_header="OSM Release TWO:"
-tag_message="$tag_header version $TAG"
+tag_header="OSM Release THREE:" tag_message="$tag_header version $TAG"
 
-modules="juju-charms devops descriptor-packages openvim RO SO UI osmclient"
+modules="devops openvim RO SO UI IM osmclient"
 list=""
 for i in $modules; do
     if [ "$1" == "$i" -o "$1" == "all" ]; then
@@ -26,14 +25,11 @@ if [ -z "$list" ]; then
 fi
 
 for i in $list; do
-    echo
     echo $i
-    if [ "$i" == "juju-charms" ] && [ "$1" == "all" ] ; then
-        #This is to allow "./newtag.sh all v2.0.0", and still checkout master in "juju-charms" before tagging
-        git -C $i checkout master
-    else
-        git -C $i checkout $CURRENT_BRANCH
+    if [ ! -d $i ]; then
+        git clone ssh://$USER@osm.etsi.org:29418/osm/$i
     fi
+    git -C $i checkout master
     git -C $i pull --rebase
     git -C $i tag -a $TAG -m"$tag_message"
     git -C $i push origin $TAG --follow-tags
@@ -41,4 +37,3 @@ for i in $list; do
 done
 
 exit 0
-