commit eca5ac244c78de8f6a6a4a2e0029c812d833d4f5
author jenkins-mk jenkins-mk <jenkins-mk@gerrit.mcp.mirantis.net> Fri Mar 31 11:44:25 2017 +0000
committer Gerrit Code Review <gerrit2@8d47cb36f245> Fri Mar 31 11:44:27 2017 +0000
tree 0a5904b2815045119257f2b371ecab3698f39614
parent bdc51817ba0c4a86315ef892ada8c1378622bff4
parent 5ce6a36b27a89fecc862055afffe1ab57dcde6b3

Merge "Improved error handling in test pipelines."

test-groovy-pipeline.groovy

diff --git a/test-groovy-pipeline.groovy b/test-groovy-pipeline.groovy
index 71e9fc0..edd549a 100644
--- a/test-groovy-pipeline.groovy
+++ b/test-groovy-pipeline.groovy
@@ -38,7 +38,7 @@
               checkouted = gerrit.gerritPatchsetCheckout(defaultGitUrl, defaultGitRef, "HEAD", CREDENTIALS_ID)
           }
           if(!checkouted){
-            common.errorMsg("Cannot checkout gerrit patchset, GERRIT_REFSPEC and DEFAULT_GIT_REF is null")
+            throw new Exception("Cannot checkout gerrit patchset, GERRIT_REFSPEC and DEFAULT_GIT_REF is null")
           }
         }
         stage ('Run Codenarc tests'){

test-salt-formulas-pipeline.groovy

diff --git a/test-salt-formulas-pipeline.groovy b/test-salt-formulas-pipeline.groovy
index 91f977b..e53e652 100644
--- a/test-salt-formulas-pipeline.groovy
+++ b/test-salt-formulas-pipeline.groovy
@@ -37,7 +37,7 @@
           checkouted = gerrit.gerritPatchsetCheckout(defaultGitUrl, defaultGitRef, "HEAD", CREDENTIALS_ID)
       }
       if(!checkouted){
-        common.errorMsg("Cannot checkout gerrit patchset, GERRIT_REFSPEC and DEFAULT_GIT_REF is null")
+        throw new Exception("Cannot checkout gerrit patchset, GERRIT_REFSPEC and DEFAULT_GIT_REF is null")
       }
     }
     stage("test") {

test-salt-models-pipeline.groovy

diff --git a/test-salt-models-pipeline.groovy b/test-salt-models-pipeline.groovy
index 05695b2..d43c217 100644
--- a/test-salt-models-pipeline.groovy
+++ b/test-salt-models-pipeline.groovy
@@ -49,7 +49,7 @@
           ssh.agentSh("git submodule init; git submodule sync; git submodule update --recursive")
         }
       }else{
-        common.errorMsg("Cannot checkout gerrit patchset, GERRIT_REFSPEC and DEFAULT_GIT_REF is null")
+        throw new Exception("Cannot checkout gerrit patchset, GERRIT_REFSPEC and DEFAULT_GIT_REF is null")
       }
     }
     stage("test") {

test-system-reclass-pipeline.groovy

diff --git a/test-system-reclass-pipeline.groovy b/test-system-reclass-pipeline.groovy
index a63a7df..65fce27 100644
--- a/test-system-reclass-pipeline.groovy
+++ b/test-system-reclass-pipeline.groovy
@@ -57,7 +57,7 @@
         }
       parallel branches
     }else{
-       common.errorMsg("Cannot checkout gerrit patchset, GERRIT_REFSPEC and DEFAULT_GIT_REF is null")
+       throw new Exception("Cannot checkout gerrit patchset, GERRIT_REFSPEC and DEFAULT_GIT_REF is null")
     }
   }
 } catch (Throwable e) {