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

diff --git a/tools/newtag.sh b/tools/newtag.sh
index 78cd4bba..644120ee 100755
--- a/tools/newtag.sh
+++ b/tools/newtag.sh
@@ -1,15 +1,35 @@
 #!/bin/bash
-if [ $# -ne 2 ]; then
-    echo "Usage $0 <repo> <tag>"
+#
+#   Copyright 2020 ETSI
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+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
 
-CURRENT_BRANCH="v2.0"
-TAG="$2"
-tag_header="OSM Release TWO:"
+BRANCH="$2"
+TAG="$3"
+USER="$4"
+RELEASE_NAME="$5"
+tag_header="OSM Release $RELEASE_NAME:"
 tag_message="$tag_header version $TAG"
 
-modules="juju-charms devops descriptor-packages openvim RO SO UI osmclient"
+modules="common devops IM LCM LW-UI MON N2VC NBI openvim osmclient RO vim-emu POL NG-UI PLA"
 list=""
 for i in $modules; do
     if [ "$1" == "$i" -o "$1" == "all" ]; then
@@ -26,14 +46,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 $BRANCH
     git -C $i pull --rebase
     git -C $i tag -a $TAG -m"$tag_message"
     git -C $i push origin $TAG --follow-tags
@@ -41,4 +58,3 @@ for i in $list; do
 done
 
 exit 0
-