JENKINS-48177 Even marking build as unstable when errors during scrip…

…t execution appear
jenkinsci · Nov 23, 2017 · fc837be · fc837be
1 parent 1cd74fc
commit fc837be
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/postbuildscript/Processor.java b/src/main/java/org/jenkinsci/plugins/postbuildscript/Processor.java
@@ -66,44 +66,36 @@ public boolean process() {
             return processScripts();
         } catch (PostBuildScriptException pse) {
             logger.error(Messages.PostBuildScript_ProblemOccured(pse.getMessage()));
-            build.setResult(Result.FAILURE);
+            failOrUnstable();
             return false;
         }
     }
 
     private boolean processScripts() throws PostBuildScriptException {
 
         if (!processGenericScriptFiles()) {
-            return setBuildStepsResult();
+            return failOrUnstable();
         }
 
         if (!processGroovyScriptFiles()) {
-            return setBuildStepsResult();
+            return failOrUnstable();
         }
 
         if (!processGroovyScripts()) {
-            return setBuildStepsResult();
+            return failOrUnstable();
         }
 
-        return processBuildSteps() || setBuildStepsResult();
+        return processBuildSteps() || failOrUnstable();
 
     }
 
-    private boolean setBuildStepsResult() {
+    private boolean failOrUnstable() {
         if (config.isMarkBuildUnstable()) {
-            setUnstableResult();
+            build.setResult(Result.UNSTABLE);
             return true;
         }
-        setFailedResult();
-        return false;
-    }
-
-    private void setFailedResult() {
         build.setResult(Result.FAILURE);
-    }
-
-    private void setUnstableResult() {
-        build.setResult(Result.UNSTABLE);
+        return false;
     }
 
     private boolean processGenericScriptFiles()