Skip to content
This repository was archived by the owner on Dec 13, 2023. It is now read-only.

Lazy evaluate workflow only in case of task is successful. #3655

Merged
merged 3 commits into from
Jun 21, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -925,10 +925,12 @@ boolean isLazyEvaluateWorkflow(WorkflowDef workflowDef, TaskModel task) {
.collect(Collectors.toList());

if (forkTasks.stream().anyMatch(fork -> fork.has(taskRefName))) {
return joinTasks.stream().anyMatch(join -> join.getJoinOn().contains(taskRefName));
return joinTasks.stream().anyMatch(join -> join.getJoinOn().contains(taskRefName))
&& task.getStatus().isSuccessful();
}

return workflowTasks.stream().noneMatch(t -> t.getTaskReferenceName().equals(taskRefName));
return workflowTasks.stream().noneMatch(t -> t.getTaskReferenceName().equals(taskRefName))
&& task.getStatus().isSuccessful();
}

public TaskModel getTask(String taskId) {
Original file line number Diff line number Diff line change
@@ -2487,6 +2487,7 @@ public void testIsLazyEvaluateWorkflow() {
workflowDef.getTasks().addAll(List.of(simpleTask, forkTask, joinTask, doWhile));

TaskModel task = new TaskModel();
task.setStatus(TaskModel.Status.COMPLETED);

// when:
task.setReferenceTaskName("dynamic");
@@ -2504,6 +2505,10 @@ public void testIsLazyEvaluateWorkflow() {
task.setReferenceTaskName("loopTask__1");
task.setIteration(1);
assertFalse(workflowExecutor.isLazyEvaluateWorkflow(workflowDef, task));

task.setReferenceTaskName("branchTask1");
task.setStatus(TaskModel.Status.FAILED);
assertFalse(workflowExecutor.isLazyEvaluateWorkflow(workflowDef, task));
}

@Test