X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=tools%2Fnewtag.sh;h=249c2776e30d9b3e21e62a65562795433a92e4b1;hb=cb7dc67d460141b98472561ce080cf378c9cd785;hp=35a2973494445c43837883e799c76583d86c26c1;hpb=efea4bd921be8cea671ea5402e3becf297e96870;p=osm%2Fdevops.git

diff --git a/tools/newtag.sh b/tools/newtag.sh
index 35a29734..249c2776 100755
--- a/tools/newtag.sh
+++ b/tools/newtag.sh
@@ -1,18 +1,35 @@
 #!/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"
+#
+#   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
 
-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"
 
-modules="common devops IM LCM LW-UI MON N2VC NBI openvim osmclient RO vim-emu"
+modules="common devops IM LCM MON N2VC NBI NG-UI NG-SA osmclient RO PLA POL SOL003 SOL005 tests"
 list=""
 for i in $modules; do
     if [ "$1" == "$i" -o "$1" == "all" ]; then
@@ -33,8 +50,9 @@ 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 || ! echo "$BRANCH was not found in $i repo" || continue
     git -C $i pull --rebase
+    echo "Creating new tag $TAG in repo $i associated to branch $BRANCH"
     git -C $i tag -a $TAG -m"$tag_message"
     git -C $i push origin $TAG --follow-tags
     sleep 2