enable to create agent workspace by FLOW_AGNET_WORKSAPCE varable

Author: Yang Guo

platform-api/src/main/java/com/flow/platform/api/domain/envs/AgentEnvs.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright 2017 flow.ci
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.flow.platform.api.domain.envs;
+
+/**
+ * @author yang
+ */
+public enum AgentEnvs implements EnvKey {
+
+    FLOW_AGENT_WORKSPACE,
+
+    FLOW_AGENT_OUTPUT_ENV_PREFIX
+}

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

@@ -16,6 +16,7 @@
 
 package com.flow.platform.api.service.job;
 
+import com.flow.platform.api.domain.envs.AgentEnvs;
 import com.flow.platform.api.domain.job.Job;
 import com.flow.platform.api.domain.node.Node;
 import com.flow.platform.api.util.PlatformURL;
@@ -101,10 +102,11 @@ public CmdInfo runShell(Job job, Node node, String cmdId) {
         CmdInfo cmdInfo = new CmdInfo(zone, null, CmdType.RUN_SHELL, node.getScript());
         cmdInfo.setInputs(node.getEnvs());
         cmdInfo.setWebhook(buildCmdWebhook(job));
-        cmdInfo.setOutputEnvFilter("FLOW_OUTPUT");
+        cmdInfo.setOutputEnvFilter(job.getEnv(AgentEnvs.FLOW_AGENT_OUTPUT_ENV_PREFIX, "FLOW_OUTPUT"));
         cmdInfo.setSessionId(job.getSessionId());
         cmdInfo.setExtra(node.getPath()); // use cmd.extra to keep node path info
         cmdInfo.setCustomizedId(cmdId);
+        cmdInfo.setWorkingDir(job.getEnv(AgentEnvs.FLOW_AGENT_WORKSPACE, null));
 
         try {
             LOGGER.traceMarker("RunShell", "step name - %s, node path - %s", node.getName(), node.getPath());

platform-cmd-runner/src/main/java/com/flow/platform/cmd/CmdExecutor.java

@@ -23,6 +23,7 @@
 
 import java.io.*;
 import java.lang.reflect.Field;
+import java.nio.file.Files;
 import java.time.ZonedDateTime;
 import java.util.*;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -128,12 +129,12 @@ public Thread newThread(Runnable r) {
      * @param cmd exec cmd
      */
     public CmdExecutor(final ProcListener procListener,
-        final LogListener logListener,
-        final Map<String, String> inputs,
-        final String workingDir,
-        final String outputEnvFilter,
-        final Integer timeout,
-        final List<String> cmds) {
+                       final LogListener logListener,
+                       final Map<String, String> inputs,
+                       final String workingDir,
+                       final String outputEnvFilter,
+                       final Integer timeout,
+                       final List<String> cmds) {
 
         if (procListener != null) {
             this.procListener = procListener;
@@ -153,9 +154,15 @@ public CmdExecutor(final ProcListener procListener,
         // check and init working dir
         if (workingDir != null) {
             File dir = new File(workingDir);
+
             if (!dir.exists()) {
-                throw new IllegalArgumentException(String.format("Cmd defined working dir '%s' not found", workingDir));
+                try {
+                    Files.createDirectories(dir.toPath());
+                } catch (IOException e) {
+                    throw new IllegalArgumentException("Unable to create working dir: " + dir);
+                }
             }
+
             this.pBuilder.directory(dir);
         }
 
@@ -341,8 +348,8 @@ private Runnable createStdStreamReader(final Log.Type type, final InputStream is
      * put env item which match 'start with filter' to CmdResult.output map
      */
     private void readEnv(final BufferedReader reader,
-        final Map<String, String> output,
-        final String filter) throws IOException {
+                         final Map<String, String> output,
+                         final String filter) throws IOException {
         String line;
         while ((line = reader.readLine()) != null) {
             if (line.startsWith(filter)) {