[JENKINS-37781] fixing the compilation of the compiler

and cleaned up some debug echo
jenkinsci · Oct 26, 2016 · 9676206 · 9676206
1 parent dfab9e2
commit 9676206
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 11 deletions.
diff --git a/...inition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Stage.groovy b/...inition/src/main/groovy/org/jenkinsci/plugins/pipeline/modeldefinition/model/Stage.groovy
@@ -51,7 +51,7 @@ public class Stage implements NestedModel, Serializable {
     PostStage post
 
     @Whitelisted
-    Closure<Boolean> when
+    StepsBlock when
 
     @Whitelisted
     Stage name(String n) {
@@ -84,7 +84,7 @@ public class Stage implements NestedModel, Serializable {
     }
 
     @Whitelisted
-    Stage when(Closure<Boolean> when) {
+    Stage when(StepsBlock when) {
         this.when = when
         return this
     }

diff --git a/...src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy b/...src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/ModelInterpreter.groovy
@@ -291,16 +291,13 @@ public class ModelInterpreter implements Serializable {
     }
 
     def runStageOrNot(Stage stage, Throwable firstError, Closure body) {
-        script.echo "Run stage or not!"
         if (stage.when != null && firstError == null) {
-            script.echo "One when!"
             return {
-                if (stage.when.call()) {
+                if (setUpDelegate(stage.when.closure).call()) {
                     body.call()
                 }
             }
         } else {
-            script.echo "No when!"
             return {
                 body.call()
             }

diff --git a/...efinition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WhenStageTest.java b/...efinition/src/test/java/org/jenkinsci/plugins/pipeline/modeldefinition/WhenStageTest.java
@@ -31,7 +31,6 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.IOException;
 
 /**
  * Tests {@link Stage#when}

diff --git a/pipeline-model-definition/src/test/resources/simpleWhen.groovy b/pipeline-model-definition/src/test/resources/simpleWhen.groovy
@@ -27,10 +27,6 @@ pipeline {
     agent label: "here"
     stages {
         stage("One") {
-            when {
-                echo "Should I run?"
-                return true
-            }
             steps {
                 echo "Hello"
             }