commit 812673abea50c4b19941c2e29700510667f21460
author Dmitry Tyzhnenko <t.dmitry@gmail.com> Thu Mar 26 21:59:14 2020 +0200
committer Dmitry Tyzhnenko <dtyzhnenko@mirantis.com> Thu Mar 26 21:59:14 2020 +0200
tree 1702c4e692fd335d77ff53c376117a32835f2f27
parent 1906390c64e7fdb6f486a8abcb58c7c9215cfb93

Make uploadJobArtifactsToArtifactory more universal

Related-prod: PRODX-3226
Change-Id: I4207afcaa03e4f69395f8aa6b5be3e06f43b197d

src/com/mirantis/mcp/MCPArtifactory.groovy

diff --git a/src/com/mirantis/mcp/MCPArtifactory.groovy b/src/com/mirantis/mcp/MCPArtifactory.groovy
index 6f3780a..b988183 100644
--- a/src/com/mirantis/mcp/MCPArtifactory.groovy
+++ b/src/com/mirantis/mcp/MCPArtifactory.groovy
@@ -425,7 +425,7 @@
             return "Artifactory server is not found. Can't save artifacts in Artifactory."
         }
     }
-    def artifactDir = 'cur_build_artifacts'
+    def artifactDir = config.get('artifactDir') ?: 'cur_build_artifacts'
     def user = ''
     wrap([$class: 'BuildUser']) {
         user = env.BUILD_USER_ID
@@ -435,13 +435,14 @@
             unarchive(mapping: ['**/*' : '.'])
             // Mandatory and additional properties
             def properties = getBinaryBuildProperties(config.get('buildProps', []) << "buildUser=${user}")
+            def pattern = config.get('artifactPattern') ?: '*'
 
             // Build Artifactory spec object
             def uploadSpec = """{
                 "files":
                     [
                         {
-                            "pattern": "*",
+                            "pattern": "${pattern}",
                             "target": "${config.get('artifactoryRepo')}/",
                             "flat": false,
                             "props": "${properties}"