Merge branch 'master' of https://dev.azure.com/olympusai/Olympus/_git/hermione
This commit is contained in:
@@ -93,9 +93,17 @@ public class ScenarioExecutionService {
|
|||||||
scenarioOutput.setScenarioExecution_id(scenarioExecution.getId());
|
scenarioOutput.setScenarioExecution_id(scenarioExecution.getId());
|
||||||
scenarioOutput.setStatus("OK");
|
scenarioOutput.setStatus("OK");
|
||||||
scenarioOutput.setStringOutput(scenarioExecution.getExecSharedMap().get("scenario_output").toString());
|
scenarioOutput.setStringOutput(scenarioExecution.getExecSharedMap().get("scenario_output").toString());
|
||||||
|
scenarioOutput.setMessage("");
|
||||||
}else{
|
}else{
|
||||||
scenarioOutput.setScenarioExecution_id(scenarioExecution.getId());
|
scenarioOutput.setScenarioExecution_id(scenarioExecution.getId());
|
||||||
scenarioOutput.setStatus("IN_PROGRESS");
|
scenarioOutput.setStatus("IN_PROGRESS");
|
||||||
|
scenarioOutput.setCurrentStepId(scenarioExecution.getCurrentStepId());
|
||||||
|
scenarioOutput.setCurrentStepDescription(scenarioExecution.getCurrentStepDescription());
|
||||||
|
if (scenarioOutput.getCurrentStepId() != null){
|
||||||
|
scenarioOutput.setMessage("Executing "+scenarioOutput.getCurrentStepId()+"/"+scenarioExecution.getScenario().getSteps().size()+": "+scenarioOutput.getCurrentStepDescription()+".");
|
||||||
|
}else {
|
||||||
|
scenarioOutput.setMessage("Starting execution...");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(scenarioExecution.getLatestStepStatus()!= null && scenarioExecution.getLatestStepStatus().equals("ERROR")){
|
if(scenarioExecution.getLatestStepStatus()!= null && scenarioExecution.getLatestStepStatus().equals("ERROR")){
|
||||||
|
|||||||
Reference in New Issue
Block a user