commit 7b66316446911a42dfecae843561dbebb796b43b
author Matteo Scandolo <teo@opennetworking.org> Thu Jun 03 16:42:14 2021 +0000
committer Gerrit Code Review <gerrit@opencord.org> Thu Jun 03 16:42:14 2021 +0000
tree dc4960b68e90e872b1ff0ce830221cdb29149d56
parent 8f64db24630a6a2e56bc0b483c0860e43c5bab1b
parent 9725cdb1f6d7d94b44802863c29e9a87dc1ff4af

Merge "Parent version matching shouldn't be exclusive"

jjb/shell/tagcollisionreject.sh

diff --git a/jjb/shell/tagcollisionreject.sh b/jjb/shell/tagcollisionreject.sh
index c1ab545..01772c5 100755
--- a/jjb/shell/tagcollisionreject.sh
+++ b/jjb/shell/tagcollisionreject.sh
@@ -126,9 +126,10 @@
         found_parent=true
       fi
     done
+  fi
 
   # if patch == 0, check that there was a release with MAJOR.MINOR-1.X
-  elif [[ "$PATCH" == 0 ]]; then
+  if [[ "$PATCH" == 0 ]]; then
     new_minor=$(( $MINOR - 1 ))
     parent_version="$MAJOR.$new_minor.x"
     for existing_tag in $existing_tags
@@ -138,9 +139,10 @@
         found_parent=true
       fi
     done
+  fi
 
   # if patch != 0 check that there was a release with MAJOR.MINOR.PATCH-1
-  elif [[ "$PATCH" != 0 ]]; then
+  if [[ "$PATCH" != 0 ]]; then
     new_patch=$(( $PATCH - 1 ))
     parent_version="$MAJOR.$MINOR.$new_patch"
     for existing_tag in $existing_tags