From 7999d4b4d232420efbb5ed7bfe819515e937cd71 Mon Sep 17 00:00:00 2001 From: Narendervemula Date: Tue, 25 Sep 2018 02:58:57 +0000 Subject: [PATCH] Added Bash Execution for Airship Build workflow Change-Id: I9d5d6296610ec2a556490ade7ebfc4af9454a837 Signed-off-by: Narendervemula --- .../akraino/bpm/delegate/ScriptExecutorTaskDelegate.java | 14 ++++++++++++-- .../bpm/service/impl/AsyncProcessExecutorServiceImpl.java | 3 +-- .../bpm/service/impl/ScriptExecutionServiceImpl.java | 2 +- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/akraino/src/main/java/com/akraino/bpm/delegate/ScriptExecutorTaskDelegate.java b/akraino/src/main/java/com/akraino/bpm/delegate/ScriptExecutorTaskDelegate.java index 59beee8..822b56d 100644 --- a/akraino/src/main/java/com/akraino/bpm/delegate/ScriptExecutorTaskDelegate.java +++ b/akraino/src/main/java/com/akraino/bpm/delegate/ScriptExecutorTaskDelegate.java @@ -40,8 +40,18 @@ public class ScriptExecutorTaskDelegate implements JavaDelegate { public void execute(DelegateExecution ctx) throws Exception { String filepath=(String)ctx.getVariable("filepath"); - logger.debug("task execution started :"+filepath); - scriptExecutionService.executeScript(filepath); + String fileparams=(String)ctx.getVariable("fileparams"); + logger.debug("task execution started {} :",filepath); + + + int lastindex=filepath.lastIndexOf("/"); + String srcdir=filepath.substring(0,lastindex); + String filename=filepath.substring(lastindex+1,filepath.length()); + String task= filename+" "+(fileparams!=null?fileparams.replaceAll(",", " "):" "); + + logger.debug("task execution started command: {} , src dir :{}",task,srcdir); + + scriptExecutionService.executeCDBashScript(srcdir,task); } } diff --git a/akraino/src/main/java/com/akraino/bpm/service/impl/AsyncProcessExecutorServiceImpl.java b/akraino/src/main/java/com/akraino/bpm/service/impl/AsyncProcessExecutorServiceImpl.java index d2e303b..4dcc92a 100644 --- a/akraino/src/main/java/com/akraino/bpm/service/impl/AsyncProcessExecutorServiceImpl.java +++ b/akraino/src/main/java/com/akraino/bpm/service/impl/AsyncProcessExecutorServiceImpl.java @@ -95,9 +95,8 @@ public class AsyncProcessExecutorServiceImpl implements AsyncProcessExecutorServ private ProcessInstance executeBuildService(Build build) { - String filepath=build.getFilepath()+" "+(build.getFileparams()!=null?build.getFileparams().replaceAll(",", " "):" "); return camunda.getRuntimeService().startProcessInstanceByKey("build", - Variables.putValue("filepath", filepath).putValue("targetfolder", build.getTargetfolder())); + Variables.putValue("filepath", build.getFilepath()).putValue("fileparams", build.getFileparams()).putValue("targetfolder", build.getTargetfolder())); } @Async diff --git a/akraino/src/main/java/com/akraino/bpm/service/impl/ScriptExecutionServiceImpl.java b/akraino/src/main/java/com/akraino/bpm/service/impl/ScriptExecutionServiceImpl.java index 3cc853b..36842d3 100644 --- a/akraino/src/main/java/com/akraino/bpm/service/impl/ScriptExecutionServiceImpl.java +++ b/akraino/src/main/java/com/akraino/bpm/service/impl/ScriptExecutionServiceImpl.java @@ -100,7 +100,7 @@ public class ScriptExecutionServiceImpl implements ScriptExecutionService{ } logger.debug("Script exit code :"+p.exitValue()); if(p.exitValue()!=0) { - throw new TaskExecutorException("problem while executing the script . exist code :"+p.exitValue()); + throw new TaskExecutorException("problem while executing the script . exit code :"+p.exitValue()); } -- 2.16.6