commit 68c52133f6078dff91093476669f28dcbffd7fe1
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Jan 03 16:13:35 2018 +0000
committer Gerrit Code Review <gerrit2@e9aa877068d1> Wed Jan 03 16:13:35 2018 +0000
tree ca25361f289f23d1bd3fe24ef8da05a8135fedff
parent 845e21bf807e175322b8c6f556ef25405255e61b
parent 71300459cf074b988f358c6a4cb493390ebf409f

Merge "Fixed docker image build pipeline"

docker-build-image-pipeline.groovy

diff --git a/docker-build-image-pipeline.groovy b/docker-build-image-pipeline.groovy
index 926fd88..cb0e3f9 100644
--- a/docker-build-image-pipeline.groovy
+++ b/docker-build-image-pipeline.groovy
@@ -38,8 +38,9 @@
           def revision = sh(script: "git describe --tags --abbrev=4 | grep -oP \"^${tag}-\\K.*\" | awk -F\\- '{print \$1}'", returnStdout: true).trim()
           imageTagsList << tag
           revision = revision ? revision : "0"
-          imageTagsList << "${tag}-${revision}"
-
+          if(Integer.valueOf(revision) > 0){
+            imageTagsList << "${tag}-${revision}"
+          }
           if (!imageTagsList.contains("latest")) {
             imageTagsList << "latest"
           }