commit 35a0bc3b84df921d970c7da753d07de0db821432
author Matteo Scandolo <teo@opennetworking.org> Thu Apr 01 21:36:33 2021 +0000
committer Gerrit Code Review <gerrit@opencord.org> Thu Apr 01 21:36:33 2021 +0000
tree 60c52abeb39bfffca225f1f30756386a006eefae
parent acccab40105c383ca9752b042632e9af67e69115
parent c882f86579f5a5b282c62b19f8f29afa5d230eb2

Merge "Rancher 2.5 deploys an extra POD on the cluster, ignore it in the cleanup"

jjb/shell/tagcollisionreject.sh

diff --git a/jjb/shell/tagcollisionreject.sh b/jjb/shell/tagcollisionreject.sh
index e72554b..82b4c63 100755
--- a/jjb/shell/tagcollisionreject.sh
+++ b/jjb/shell/tagcollisionreject.sh
@@ -145,7 +145,8 @@
     parent_version="$MAJOR.$MINOR.$new_patch"
     for existing_tag in $existing_tags
     do
-      if [[ "$parent_version" == "$existing_tag" ]]
+      semverParseInto $existing_tag C_MAJOR C_MINOR C_PATCH C_SPECIAL
+      if [[ "$MAJOR" == "$C_MAJOR" && "$MINOR" == "$C_MINOR" && "$new_patch" == "$C_PATCH" ]]
       then
         found_parent=true
       fi