Merge branch 'master' into feat/excludeExecutionForDisabledPipelines

spinnaker · Jan 17, 2025 · c3e3f22 · c3e3f22
2 parents adf9f48 + ab81739
commit c3e3f22
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 fiatVersion=1.53.0
-korkVersion=7.247.0
+korkVersion=7.248.0
 kotlinVersion=1.6.21
 org.gradle.parallel=true
 org.gradle.jvmargs=-Xmx4g

diff --git a/.../src/main/java/com/netflix/spinnaker/orca/pipeline/persistence/DualExecutionRepository.kt b/.../src/main/java/com/netflix/spinnaker/orca/pipeline/persistence/DualExecutionRepository.kt
@@ -237,7 +237,7 @@ class DualExecutionRepository(
     return (
       primary.retrievePipelineConfigIdsForApplicationWithCriteria(application, criteria) +
         previous.retrievePipelineConfigIdsForApplicationWithCriteria(application, criteria)
-      )
+      ).distinct()
   }
 
   override fun retrievePipelinesForPipelineConfigIdsBetweenBuildTimeBoundary(

diff --git a/...flix/spinnaker/orca/front50/scheduling/UnusedPipelineDisablePollingNotificationAgent.java b/...flix/spinnaker/orca/front50/scheduling/UnusedPipelineDisablePollingNotificationAgent.java
@@ -155,7 +155,7 @@ protected void tick() {
           .retrieveAllApplicationNames(PIPELINE)
           .forEach(
               app -> {
-                log.info("Evaluating " + app + " for unused pipelines");
+                log.debug("Evaluating " + app + " for unused pipelines");
                 List<String> pipelineConfigIds =
                     front50service.getPipelines(app, false, true).stream()
                         .map(p -> (String) p.get("id"))
@@ -205,9 +205,11 @@ public void disableAppPipelines(
             + app);
     front50PipelineConfigIdsNotExecuted.forEach(
         p -> {
-          log.info("Disabling pipeline execution " + p);
           if (!dryRun) {
+            log.debug("Disabling pipeline execution " + p);
             disableFront50PipelineConfigId(p);
+          } else {
+            log.info("DryRun mode: Disabling pipeline execution " + p);
           }
         });
   }

diff --git a/orca-web/src/test/groovy/com/netflix/spinnaker/orca/controllers/TaskControllerSpec.groovy b/orca-web/src/test/groovy/com/netflix/spinnaker/orca/controllers/TaskControllerSpec.groovy
@@ -248,7 +248,8 @@ class TaskControllerSpec extends Specification {
         pipelineConfigId = config.pipelineConfigId
       }
     })
-    front50Service.getPipelines(app, false, null) >> [[id: "1"], [id: "2"]]
+    taskControllerConfigurationProperties.excludeExecutionsOfDisabledPipelines = excludeExecutionsOfDisabledPipelines
+    front50Service.getPipelines(app, false, taskControllerConfigurationProperties.excludeExecutionsOfDisabledPipelines ? true : null) >> front50ConfigIds
     front50Service.getStrategies(app) >> []
 
     executionRepository.retrievePipelineConfigIdsForApplication(app) >> { return List.of( '2')}
@@ -258,7 +259,13 @@ class TaskControllerSpec extends Specification {
     List results = new ObjectMapper().readValue(response.contentAsString, List)
 
     then:
-    results.id == ['not-started', 'also-not-started', 'older2', 'older1', 'newer']
+    results.id == resultsIds
+
+    where:
+    excludeExecutionsOfDisabledPipelines  | front50ConfigIds        | resultsIds
+    null                                  | [[id: "1"], [id: "2"]]  | ['not-started', 'also-not-started', 'older2', 'older1', 'newer']
+    false                                 | [[id: "1"], [id: "2"]]  | ['not-started', 'also-not-started', 'older2', 'older1', 'newer']
+    true                                  | [[id: "2"]]             | ['older2', 'older1']
   }
 
   void '/applications/{application}/evaluateExpressions precomputes values'() {