Fix small bugs in release scripts

[policy/parent.git] / integration / src / main / scripts / release / updateRefs.sh

diff --git a/integration/src/main/scripts/release/updateRefs.sh b/integration/src/main/scripts/release/updateRefs.sh
index 14f90d9..9e1231a 100755 (executable)
--- a/integration/src/main/scripts/release/updateRefs.sh
+++ b/integration/src/main/scripts/release/updateRefs.sh
@@ -244,8 +244,8 @@ then
             major_version=$(echo "$parent_latest_released_tag" | $SED -E 's/^([0-9]*)\.[0-9]*\.[0-9]*$/\1/')
             minor_version=$(echo "$parent_latest_released_tag" | $SED -E 's/^[0-9]*\.([0-9]*)\.[0-9]*$/\1/')
             patch_version=$(echo "$parent_latest_released_tag" | $SED -E 's/^[0-9]*\.[0-9]*\.([0-9]*)$/\1/')
-            new_patch_version=$(("$patch_version"+1))
 
+            new_patch_version=$((patch_version+1))
             new_snapshot_tag="$major_version"."$minor_version"."$new_patch_version"-SNAPSHOT
 
             echo updating policy parent reference to "$new_snapshot_tag" on "$repo_location/$target_repo" . . .
@@ -401,13 +401,21 @@ fi
 
 if [ "$update_docker" = true ] && [ "$target_docker_images" != "" ]
 then
-    echo "updating docker base images to version $docker_latest_released_tag on repo $repo_location/$target_repo . . ."
-    find "$repo_location/$target_repo" \
-        -name '*Docker*'
-    find "$repo_location/$target_repo" \
-        -name '*Docker*' \
-        -exec $SED -r -i "s/^(FROM onap\/policy-j[d|r][k|e]-alpine:)[0-9]*.[0-9]*.[0-9]*$/\1$docker_latest_released_tag/" {} \;
-    result_code=$?
+    if [ "$update_snapshot" == true ]
+    then
+        echo "updating docker base images to version $docker_latest_snapshot_tag on repo $repo_location/$target_repo . . ."
+        find "$repo_location/$target_repo" \
+            -name '*Docker*' \
+            -exec $SED -r -i "s/^(FROM onap\/policy-j[d|r][k|e]-alpine:)[0-9]*.[0-9]*.[0-9].*$/\1$docker_latest_snapshot_tag/" {} \;
+        result_code=$?
+    else
+        echo "updating docker base images to version $docker_latest_released_tag on repo $repo_location/$target_repo . . ."
+        find "$repo_location/$target_repo" \
+            -name '*Docker*' \
+            -exec $SED -r -i "s/^(FROM onap\/policy-j[d|r][k|e]-alpine:)[0-9]*.[0-9]*.[0-9].*$/\1$docker_latest_released_tag/" {} \;
+        result_code=$?
+    fi
+
     if [[ "$result_code" -eq 0 ]]
     then
         echo "docker base images updated on $repo_location/$target_repo"