JENKINS-39463# Integrate pipeline-model-definition 0.6 (#594)

* JENKINS-39463# Integrate pipeline-model-definition 0.5

* Reverted tests as they should pass eventually once JENKINS-39631 is resolved.

* Build with declarative plugin snashot build for further testing.

* Updated released declarative pipeline version 0.6

* Use NOT_BUILT to represent result and state for step/stages not built.

blueocean-pipeline-api-impl/pom.xml

@@ -86,7 +86,7 @@
         <dependency>
             <groupId>org.jenkinsci.plugins</groupId>
             <artifactId>pipeline-model-definition</artifactId>
-            <version>0.2</version>
+            <version>0.6</version>
             <scope>test</scope>
         </dependency>
         <dependency>

blueocean-pipeline-api-impl/src/main/java/io/jenkins/blueocean/rest/impl/pipeline/NodeRunStatus.java

@@ -40,6 +40,7 @@ public class NodeRunStatus {
     public BlueRun.BlueRunState getState() {
         return state;
     }
+
     public NodeRunStatus(GenericStatus status){
         if (status == null) {
             this.result = BlueRun.BlueRunResult.NOT_BUILT;
@@ -73,7 +74,7 @@ public class NodeRunStatus {
                 break;
             case NOT_EXECUTED:
                 this.result = BlueRun.BlueRunResult.NOT_BUILT;
-                this.state = BlueRun.BlueRunState.QUEUED;
+                this.state = BlueRun.BlueRunState.NOT_BUILT;
                 break;
             default:
                 // Shouldn't happen, above includes all statuses

blueocean-pipeline-api-impl/src/test/java/io/jenkins/blueocean/rest/impl/pipeline/PipelineNodeTest.java

@@ -1585,23 +1585,36 @@ public class PipelineNodeTest extends PipelineBaseTest {
             "    agent label:''\n" +
             "    stages {\n" +
             "        stage ('Build') {\n" +
+                "steps{\n" +
             "            sh 'echo1 \"Building\"'\n" +
             "        }\n" +
+                "}\n" +
             "        stage ('Test') {\n" +
+                "steps{\n" +
             "            sh 'echo \"Building\"'\n" +
             "        }\n" +
+                "}\n" +
             "        stage ('Deploy') {\n" +
+                "steps{\n" +
             "            sh 'echo \"Building\"'\n" +
             "        }\n" +
+                "}\n" +
             "    }\n" +
             "}\n"));
 
         WorkflowRun b1 = job1.scheduleBuild2(0).get();
         j.assertBuildStatus(Result.FAILURE, b1);
         List<Map> nodes = get("/organizations/jenkins/pipelines/pipeline1/runs/1/nodes/", List.class);
-        Assert.assertEquals(1, nodes.size());
+        Assert.assertEquals(3, nodes.size());
+
         Assert.assertEquals("FAILURE", nodes.get(0).get("result"));
         Assert.assertEquals("FINISHED", nodes.get(0).get("state"));
+
+        Assert.assertEquals("NOT_BUILT",nodes.get(1).get("result"));
+        Assert.assertEquals("NOT_BUILT",nodes.get(1).get("state"));
+
+        Assert.assertEquals("NOT_BUILT",nodes.get(2).get("result"));
+        Assert.assertEquals("NOT_BUILT",nodes.get(2).get("state"));
     }
 
     @Test
@@ -1611,14 +1624,20 @@ public class PipelineNodeTest extends PipelineBaseTest {
             "    agent label:''\n" +
             "    stages {\n" +
             "        stage ('Build') {\n" +
+                "steps{\n" +
             "            sh 'echo \"Building\"'\n" +
+                "}\n"+
             "        }\n" +
             "        stage ('Test') {\n" +
+                "steps{\n" +
             "            sh 'echo \"Building\"'\n" +
             "            sh 'echo2 \"Building finished\"'\n" +
+                "}\n" +
             "        }\n" +
             "        stage ('Deploy') {\n" +
+                "steps{\n" +
             "            sh 'echo \"Building\"'\n" +
+                "}\n"+
             "        }\n" +
             "    }\n" +
             "}\n"));
@@ -1626,7 +1645,7 @@ public class PipelineNodeTest extends PipelineBaseTest {
         WorkflowRun b1 = job1.scheduleBuild2(0).get();
         j.assertBuildStatus(Result.FAILURE, b1);
         List<Map> nodes = get("/organizations/jenkins/pipelines/pipeline1/runs/1/nodes/", List.class);
-        Assert.assertEquals(2, nodes.size());
+        Assert.assertEquals(3, nodes.size());
         Assert.assertEquals("SUCCESS", nodes.get(0).get("result"));
         Assert.assertEquals("FINISHED", nodes.get(0).get("state"));
         Assert.assertEquals("FAILURE", nodes.get(1).get("result"));
@@ -1640,13 +1659,19 @@ public class PipelineNodeTest extends PipelineBaseTest {
             "    agent label:''\n" +
             "    stages {\n" +
             "        stage ('Build') {\n" +
+                "steps{\n"+
             "            sh 'echo \"Building\"'\n" +
+                "}\n"+
             "        }\n" +
             "        stage ('Test') {\n" +
+                "steps{\n"+
             "            sh 'echo \"Testing\"'\n" +
+                "}\n"+
             "        }\n" +
             "        stage ('Deploy') {\n" +
+                "steps{\n"+
             "            sh 'echo1 \"Deploying\"'\n" +
+                "}\n"+
             "        }\n" +
             "    }\n" +
             "}\n"));

blueocean-rest/src/main/java/io/jenkins/blueocean/rest/model/BlueRun.java

@@ -222,6 +222,7 @@ public abstract class BlueRun extends Resource {
         QUEUED,
         RUNNING,
         PAUSED,
+        NOT_BUILT,
         FINISHED
     }
 

blueocean/pom.xml

@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.jenkinsci.plugins</groupId>
             <artifactId>pipeline-model-definition</artifactId>
-            <version>0.2</version>
+            <version>0.6</version>
         </dependency>
 
         <dependency>