Merge branch 'master' into feat/excludeExecutionForDisabledPipelines

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

Hide file tree

Showing 3 changed files with 6 additions and 4 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("Disabling pipeline execution " + p);
           }
         });
   }