Merge branch 'master' into feat/excludeExecutionForDisabledPipelines

Author: christosarvanitis

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

orca-core/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(

orca-front50/src/main/java/com/netflix/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);
           }
         });
   }