Merge branch 'master' into feat/excludeExecutionForDisabledPipelines

spinnaker · Jan 20, 2025 · f6b526e · f6b526e
2 parents c3e3f22 + 93f27cc
commit f6b526e
Show file tree

Hide file tree

Showing 5 changed files with 644 additions and 34 deletions.
diff --git a/...core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/StageExecutionInternals.java b/...core/src/main/java/com/netflix/spinnaker/orca/pipeline/model/StageExecutionInternals.java
@@ -22,6 +22,7 @@
 import com.netflix.spinnaker.orca.api.pipeline.SyntheticStageOwner;
 import com.netflix.spinnaker.orca.api.pipeline.models.StageExecution;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
@@ -41,15 +42,17 @@ static List<StageExecution> getAncestorsImpl(
       StageExecution stage, Set<String> visited, boolean directParentOnly) {
     visited.add(stage.getRefId());
 
-    if (!stage.getRequisiteStageRefIds().isEmpty() && !directParentOnly) {
+    if (!directParentOnly && !stage.getRequisiteStageRefIds().isEmpty()) {
       // Get stages this stage depends on via requisiteStageRefIds:
+      Collection<String> requisiteStageRefIds = stage.getRequisiteStageRefIds();
       List<StageExecution> previousStages =
           stage.getExecution().getStages().stream()
-              .filter(it -> stage.getRequisiteStageRefIds().contains(it.getRefId()))
               .filter(it -> !visited.contains(it.getRefId()))
+              .filter(it -> requisiteStageRefIds.contains(it.getRefId()))
               .collect(toList());
       List<StageExecution> syntheticStages =
           stage.getExecution().getStages().stream()
+              .filter(s -> s.getSyntheticStageOwner() != null)
               .filter(
                   s ->
                       previousStages.stream()

diff --git a/orca-kotlin/src/main/kotlin/com/netflix/spinnaker/orca/ext/Stage.kt b/orca-kotlin/src/main/kotlin/com/netflix/spinnaker/orca/ext/Stage.kt
@@ -21,7 +21,6 @@ import com.netflix.spinnaker.orca.api.pipeline.SyntheticStageOwner.STAGE_BEFORE
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus.CANCELED
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus.FAILED_CONTINUE
-import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus.NOT_STARTED
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus.SKIPPED
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus.STOPPED
 import com.netflix.spinnaker.orca.api.pipeline.models.ExecutionStatus.SUCCEEDED
@@ -83,9 +82,6 @@ fun StageExecution.upstreamStages(): List<StageExecution> =
 fun StageExecution.allUpstreamStagesComplete(): Boolean =
   upstreamStages().all { it.status in listOf(SUCCEEDED, FAILED_CONTINUE, SKIPPED) }
 
-fun StageExecution.anyUpstreamStagesFailed(): Boolean =
-  upstreamStages().any { it.status in listOf(TERMINAL, STOPPED, CANCELED) || it.status == NOT_STARTED && it.anyUpstreamStagesFailed() }
-
 fun StageExecution.syntheticStages(): List<StageExecution> =
   execution.stages.filter { it.parentStageId == id }