commit f226ece98b980b82d5ad8bceb0e09dcaec5d5ab5
author mcp-jenkins <mcp-jenkins@mirantis.com> Mon Jan 25 13:29:11 2021 +0000
committer Gerrit Code Review <mail@domain.com> Mon Jan 25 13:29:11 2021 +0000
tree 26467d4665fa267ae5d483b66a4b894991451254
parent 4be215f6644acfd56992916a22a2295d7a874708
parent 08ad67eedf83065a4d0db0b1288f458bf7ed7787

Merge "Rewrite ceph pipelines for adding and removing nodes"

generate-cookiecutter-products.groovy

diff --git a/generate-cookiecutter-products.groovy b/generate-cookiecutter-products.groovy
index a9d113f..90af5c1 100644
--- a/generate-cookiecutter-products.groovy
+++ b/generate-cookiecutter-products.groovy
@@ -479,7 +479,7 @@
                 }
                 def artifactoryLink = artifactory.uploadJobArtifactsToArtifactory([
                     'artifactory'    : 'mcp-ci',
-                    'artifactoryRepo': "drivetrain-local/${JOB_NAME}/${context['cluster_name']}-${BUILD_NUMBER}",
+                    'artifactoryRepo': "artifactory/drivetrain-local/${JOB_NAME}/${context['cluster_name']}-${BUILD_NUMBER}",
                     'buildProps'     : buildProps,
                 ])
                 currentBuild.description += "<br/>${artifactoryLink}"

test-cookiecutter-reclass-chunk.groovy

diff --git a/test-cookiecutter-reclass-chunk.groovy b/test-cookiecutter-reclass-chunk.groovy
index ed65dd6..9a697cf 100644
--- a/test-cookiecutter-reclass-chunk.groovy
+++ b/test-cookiecutter-reclass-chunk.groovy
@@ -57,7 +57,7 @@
                                          "GERRIT_PATCHSET_NUMBER=${extraVars.get('GERRIT_PATCHSET_NUMBER', '')}", "GERRIT_CHANGE_ID=${extraVars.get('GERRIT_CHANGE_ID', '')}",
                                          "GERRIT_PATCHSET_REVISION=${extraVars.get('GERRIT_PATCHSET_REVISION', '')}"]
                     withEnv(envGerritVars) {
-                        def artifactoryLink = artifactory.uploadJobArtifactsToArtifactory(['artifactory': 'mcp-ci', 'artifactoryRepo': "drivetrain-local/${JOB_NAME}/${BUILD_NUMBER}"])
+                        def artifactoryLink = artifactory.uploadJobArtifactsToArtifactory(['artifactory': 'mcp-ci', 'artifactoryRepo': "artifactory/drivetrain-local/${JOB_NAME}/${BUILD_NUMBER}"])
                         currentBuild.description += "<br/>${artifactoryLink}"
                     }
                 }

test-cookiecutter-reclass.groovy

diff --git a/test-cookiecutter-reclass.groovy b/test-cookiecutter-reclass.groovy
index 16a57b6..d018a50 100644
--- a/test-cookiecutter-reclass.groovy
+++ b/test-cookiecutter-reclass.groovy
@@ -489,7 +489,7 @@
         } finally {
             stage('Save artifacts to Artifactory') {
                 def artifactory = new com.mirantis.mcp.MCPArtifactory()
-                def artifactoryLink = artifactory.uploadJobArtifactsToArtifactory(['artifactory': 'mcp-ci', 'artifactoryRepo': "drivetrain-local/${JOB_NAME}/${BUILD_NUMBER}"])
+                def artifactoryLink = artifactory.uploadJobArtifactsToArtifactory(['artifactory': 'mcp-ci', 'artifactoryRepo': "artifactory/drivetrain-local/${JOB_NAME}/${BUILD_NUMBER}"])
                 currentBuild.description += "<br/>${artifactoryLink}"
             }
         }