Merge pull request #199 from FlowCI/feature/154

feature/154

Author: yang.guo

platform-api/src/main/java/com/flow/platform/api/envs/JobEnvs.java

@@ -25,11 +25,25 @@ public enum JobEnvs implements EnvKey {
 
     FLOW_JOB_BUILD_NUMBER,
 
+    /**
+     * Job build category (trigger type)
+     */
     FLOW_JOB_BUILD_CATEGORY,
 
+    /**
+     * Agent zone and name
+     */
     FLOW_JOB_AGENT_INFO,
 
-    FLOW_JOB_LOG_PATH;
+    /**
+     * Job log download url
+     */
+    FLOW_JOB_LOG_PATH,
+
+    /**
+     * The last step status: values in {@code NodeStatus}
+     */
+    FLOW_JOB_LAST_STATUS;
 
     private boolean readonly;
 

platform-api/src/main/java/com/flow/platform/api/service/job/JobServiceImpl.java

@@ -371,6 +371,15 @@ private void run(Node node, Job job) {
         NodeResult rootResult = nodeResultService.find(tree.root().getPath(), job.getId());
         envVars.putAll(rootResult.getOutputs());
 
+        // pass last step noed status
+        Node prev = tree.prev(node.getPath());
+        if (prev != null) {
+            NodeResult prevResult = nodeResultService.find(prev.getPath(), job.getId());
+            if (prevResult != null) {
+                envVars.putEnv(JobEnvs.FLOW_JOB_LAST_STATUS, prevResult.getStatus().toString());
+            }
+        }
+
         // to run node with customized cmd id
         try {
             NodeResult nodeResult = nodeResultService.find(node.getPath(), job.getId());
@@ -379,7 +388,7 @@ private void run(Node node, Job job) {
             EnvUtil.keepNewlineForEnv(credentialEnvs, null);
             envVars.putAll(credentialEnvs);
 
-            CmdInfo cmd = cmdService.runShell(job, node, nodeResult.getCmdId(), envVars);
+            cmdService.runShell(job, node, nodeResult.getCmdId(), envVars);
         } catch (IllegalStatusException e) {
             CmdInfo rawCmd = (CmdInfo) e.getData();
             rawCmd.setStatus(CmdStatus.EXCEPTION);

platform-api/src/main/java/com/flow/platform/api/util/NodeUtil.java

@@ -99,7 +99,7 @@ public static void recurse(final Node root, final Consumer<Node> onNode) {
      * get all nodes includes flow and steps
      *
      * @param node the parent node
-     * @return List<Node> include parent node
+     * @return {@code List<Node>} include parent node
      */
     public static List<Node> flat(final Node node) {
         final List<Node> flatted = new LinkedList<>();
@@ -122,21 +122,17 @@ public static Node findRootNode(Node node) {
      * get prev node from flow
      */
     public static Node prev(Node node, List<Node> ordered) {
-        Integer index = -1;
-        Node target = null;
+        Integer index = ordered.indexOf(node);
 
-        for (int i = 0; i < ordered.size(); i++) {
-            Node item = ordered.get(i);
-            if (item.equals(node)) {
-                index = i;
-            }
+        if (index == -1) {
+            return null;
         }
 
-        if (index >= 1 && index != -1 && index < ordered.size() - 1) {
-            target = ordered.get(index - 1);
+        if (index >= 1 && index <= ordered.size() - 1) {
+            return ordered.get(index - 1);
         }
 
-        return target;
+        return null;
     }
 
     /**
@@ -147,29 +143,18 @@ public static Node prev(Node node, List<Node> ordered) {
      * @return next node of current
      */
     public static Node next(Node node, List<Node> ordered) {
-        Integer index = -1;
-        Node target = null;
-
-        //find node
-        for (int i = 0; i < ordered.size(); i++) {
-            Node item = ordered.get(i);
-            if (item.equals(node)) {
-                index = i;
-                break;
-            }
+        Integer index = ordered.indexOf(node);
+
+        if (index == -1) {
+            return null;
         }
 
         // find node
-        if (index != -1) {
-            try {
-                target = ordered.get(index + 1);
-            } catch (Throwable ignore) {
-                //not found ignore
-                target = null;
-            }
+        try {
+            return ordered.get(index + 1);
+        } catch (Throwable ignore) {
+            return null;
         }
-
-        return target;
     }
 
     /**

platform-api/src/test/java/com/flow/platform/api/test/service/JobServiceTest.java

@@ -16,6 +16,11 @@
 
 package com.flow.platform.api.test.service;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.containing;
+import static com.github.tomakehurst.wiremock.client.WireMock.exactly;
+import static com.github.tomakehurst.wiremock.client.WireMock.matchingJsonPath;
+import static com.github.tomakehurst.wiremock.client.WireMock.moreThan;
+import static com.github.tomakehurst.wiremock.client.WireMock.moreThanOrExactly;
 import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
@@ -157,15 +162,15 @@ public void should_run_job_with_success_status() throws Throwable {
         Job job = createMockJob(root.getPath());
 
         // then: check cmd request to create session
-        CountMatchingStrategy countStrategy = new CountMatchingStrategy(CountMatchingStrategy.EQUAL_TO, 1);
-        verify(countStrategy, postRequestedFor(urlEqualTo("/cmd/queue/send?priority=1&retry=5")));
+        verify(exactly(1), postRequestedFor(urlEqualTo("/cmd/queue/send?priority=1&retry=5")));
 
         // when: simulate cc callback for create session
         Cmd cmd = new Cmd("default", null, CmdType.CREATE_SESSION, null);
         cmd.setSessionId(sessionId);
         cmd.setStatus(CmdStatus.SENT);
         CmdCallbackQueueItem createSessionItem = new CmdCallbackQueueItem(job.getId(), cmd);
         jobService.callback(createSessionItem);
+        verify(exactly(1), postRequestedFor(urlEqualTo("/cmd/send")));
 
         // then: check job status should be running
         job = reload(job);
@@ -178,6 +183,7 @@ public void should_run_job_with_success_status() throws Throwable {
         Assert.assertEquals(7, steps.size());
 
         // when: simulate callback for all steps
+        int numOfRequestForCmdSend = 2;
         for (Node step : steps) {
             NodeResult stepResult = nodeResultService.find(step.getPath(), job.getId());
 
@@ -204,16 +210,20 @@ public void should_run_job_with_success_status() throws Throwable {
             stepCmd.getCmdResult().setFinishTime(finish);
 
             // build mock identifier
-
             CmdCallbackQueueItem runStepShellItem = new CmdCallbackQueueItem(job.getId(), stepCmd);
             jobService.callback(runStepShellItem);
             stepResult = nodeResultService.find(step.getPath(), job.getId());
             Assert.assertEquals(NodeStatus.SUCCESS, stepResult.getStatus());
+
+            verify(exactly(numOfRequestForCmdSend++), postRequestedFor(urlEqualTo("/cmd/send")));
+
+            verify(moreThanOrExactly(1),
+                postRequestedFor(urlEqualTo("/cmd/send"))
+                    .withRequestBody(matchingJsonPath("$.inputs[?(@.FLOW_JOB_LAST_STATUS == 'SUCCESS')]")));
         }
 
         // then: check num of cmd request to run shell, 5 steps + 1 del session requests
-        countStrategy = new CountMatchingStrategy(CountMatchingStrategy.EQUAL_TO, 6);
-        verify(countStrategy, postRequestedFor(urlEqualTo("/cmd/send")));
+        verify(exactly(6), postRequestedFor(urlEqualTo("/cmd/send")));
 
         // then: check job status
         job = reload(job);