added check for snapshot in develop branch

sourcesense · Sep 14, 2021 · 0a764e8 · 0a764e8
1 parent 8cb0f55
commit 0a764e8
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/vars/e4tDeployDockerImageIfNeeded.groovy b/vars/e4tDeployDockerImageIfNeeded.groovy
@@ -41,12 +41,16 @@ def call(String repoName, String localTag, String remoteHost) {
                 fi ;\\
                 ;; \\
             develop) \\
-                localTag=$localTag ;\\
-                version=\${localTag%-SNAPSHOT*} ;\\
-                commitId=\${localTag#*SNAPSHOT-} ;\\
-                shortCommitId=\${commitId:0:6} ;\\
-                timeStamp=\$(date '+%Y%m%d%H%M%S') ;\\
-                remoteTag="develop-\$version-SNAPSHOT-\$shortCommitId-\$timeStamp" ;\\
+                if [[ $localTag != *SNAPSHOT* ]]; then \\
+                    echo "wrong develop tag detected, skipping (version=$localTag)" ;\\
+                else \\
+                    localTag=$localTag ;\\
+                    version=\${localTag%-SNAPSHOT*} ;\\
+                    commitId=\${localTag#*SNAPSHOT-} ;\\
+                    shortCommitId=\${commitId:0:6} ;\\
+                    timeStamp=\$(date '+%Y%m%d%H%M%S') ;\\
+                    remoteTag="develop-\$version-SNAPSHOT-\$shortCommitId-\$timeStamp" ;\\
+                fi ;\\
                 ;; \\
             feature/*) \\
                 if [[ $localTag == *-EXP-SNAPSHOT* ]]; then \\