commit 7a806bbe0421665b79a6707ff6e7202b5073d0b2
author Denis Egorenko <degorenko@mirantis.com> Mon Dec 03 14:37:05 2018 +0400
committer Denis Egorenko <degorenko@mirantis.com> Mon Dec 03 17:33:16 2018 +0400
tree 16b8b6eae906c741e7edcfef2c75f147b20711d4
parent 332f4949e0d5f00414aae7db0086256bb4be8e21

Fix test-salt-model-wrapper run

Change-Id: I76f6ae91714afe5f90704c6cfae9f444f3a0fe7b

test-salt-model-wrapper.groovy

diff --git a/test-salt-model-wrapper.groovy b/test-salt-model-wrapper.groovy
index 99384ec..6adc720 100644
--- a/test-salt-model-wrapper.groovy
+++ b/test-salt-model-wrapper.groovy
@@ -77,7 +77,7 @@
 }
 
 def checkReclassSystemDocumentationCommit(gerritLib, gerritCredentials) {
-    gerrit.gerritPatchsetCheckout([
+    gerritLib.gerritPatchsetCheckout([
         credentialsId: gerritCredentials
     ])
 
@@ -153,8 +153,8 @@
             }
             ArrayList descriptionMsgs = [ "<font color='red'>${buildType} detected!</font> Running with next parameters:" ]
             for(String project in projectsMap.keySet()) {
-                descriptionMsgs.add("Ref for ${project} => ${project.ref}")
-                descriptionMsgs.add("Branch for ${project} => ${project.branch}")
+                descriptionMsgs.add("Ref for ${project} => ${projectsMap[project]['ref']}")
+                descriptionMsgs.add("Branch for ${project} => ${projectsMap[project]['branch']}")
             }
             descriptionMsgs.add("Distrib revision => ${distribRevision}")
             currentBuild.description = descriptionMsgs.join('\n')
@@ -169,8 +169,9 @@
                 if (['master'].contains(gerritBranch) && !documentationOnly) {
                     for (int i = 0; i < testModels.size(); i++) {
                         def cluster = testModels[i]
-                        def clusterGitUrl = projectsMap[reclassSystemRepo].url.substring(0, defaultGitUrl.lastIndexOf("/") + 1) + cluster
-                        branches["reclass-system-${cluster}"] = runTestSaltModelReclass(cluster, projectsMap[reclassSystemRepo].url, clusterGitUrl, projectsMap[reclassSystemRepo].ref)
+                        //def clusterGitUrl = projectsMap[reclassSystemRepo]['url'].substring(0, defaultGitUrl.lastIndexOf("/") + 1) + cluster
+                        def clusterGitUrl = ''
+                        branches["reclass-system-${cluster}"] = runTestSaltModelReclass(cluster, projectsMap[reclassSystemRepo]['url'], clusterGitUrl, projectsMap[reclassSystemRepo]['ref'])
                     }
                 } else {
                     common.warningMsg("Tests for ${testModels} skipped!")