commit 6ee395271ba8324cd1d9e94739f6643bff618d8a
author Dmitry Burmistrov <dburmistrov@mirantis.com> Mon May 22 12:46:25 2017 +0400
committer Dmitry Burmistrov <dburmistrov@mirantis.com> Mon May 22 12:49:09 2017 +0400
tree 6e398cbdc5781b5e78ef90edc3bbcb24b3e8bbd5
parent 3f552c6abe2fd0d7bc6f6a0d65fcb5f2e5bf297e

[mcp][artifactory] Allow overriding properties

    Allow to override properties in uploadImage method

Change-Id: Ifa79733283b0282582b8dfe06280d87b159db5c4

src/com/mirantis/mcp/MCPArtifactory.groovy

diff --git a/src/com/mirantis/mcp/MCPArtifactory.groovy b/src/com/mirantis/mcp/MCPArtifactory.groovy
index 1e38ff6..1f20325 100644
--- a/src/com/mirantis/mcp/MCPArtifactory.groovy
+++ b/src/com/mirantis/mcp/MCPArtifactory.groovy
@@ -174,7 +174,8 @@
  */
 def uploadImageToArtifactory (ArtifactoryServer server, String registry, String image,
                               String version, String repository,
-                              BuildInfo buildInfo = null) {
+                              BuildInfo buildInfo = null,
+                              LinkedHashMap properties = null) {
     // TODO Switch to Artifactoy image' pushing mechanism once we will
     // prepare automatical way for enabling artifactory build-proxy
     //def artDocker
@@ -191,8 +192,8 @@
     sh ("docker push ${registry}/${image}:${version}")
     //artDocker.push("${registry}/${image}:${version}", "${repository}")
     def image_url = server.getUrl() + "/api/storage/${repository}/${image}/${version}"
-
-    def properties = [
+    if ( ! properties ) {
+        properties = [
             'com.mirantis.buildName':"${env.JOB_NAME}",
             'com.mirantis.buildNumber': "${env.BUILD_NUMBER}",
             'com.mirantis.gerritProject': "${env.GERRIT_PROJECT}",
@@ -202,7 +203,8 @@
             'com.mirantis.gerritPatchsetRevision': "${env.GERRIT_PATCHSET_REVISION}",
             'com.mirantis.targetImg': "${image}",
             'com.mirantis.targetTag': "${version}"
-    ]
+        ]
+    }
 
     setProperties(image_url, properties)