fix(cron): add explicit trigger in compensation job (#334)

Otherwise the pipelines triggered by the compensation seem to have a manual/[anonymous] trigger
spinnaker · Aug 27, 2018 · dc8353c · dc8353c
1 parent 33cb538
commit dc8353c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...pinnaker/echo/scheduler/actions/pipeline/impl/MissedPipelineTriggerCompensationJob.groovy b/...pinnaker/echo/scheduler/actions/pipeline/impl/MissedPipelineTriggerCompensationJob.groovy
@@ -204,7 +204,7 @@ class MissedPipelineTriggerCompensationJob implements ApplicationListener<Contex
         expr.timeZone = TimeZone.getTimeZone(dateContext.clock.zone)
 
         if (missedExecution(expr, lastExecution, dateContext.triggerWindowFloor(), dateContext.now(), pipeline)) {
-          pipelineInitiator.call(pipeline)
+          pipelineInitiator.call(pipeline.withTrigger(trigger))
         }
       } catch (ParseException e) {
         log.error("Error parsing cron expression (${trigger.cronExpression}) for pipeline ${pipeline.id}", e)

diff --git a/...spinnaker/echo/scheduler/actions/pipeline/MissedPipelineTriggerCompensationJobSpec.groovy b/...spinnaker/echo/scheduler/actions/pipeline/MissedPipelineTriggerCompensationJobSpec.groovy
@@ -45,9 +45,10 @@ class MissedPipelineTriggerCompensationJobSpec extends Specification {
 
   def 'should trigger pipelines for all missed executions'() {
     given:
+    def theTriggeringTrigger = new Trigger.TriggerBuilder().id('1').type(Trigger.Type.CRON.toString()).cronExpression('* 0/30 * * * ? *').enabled(true).build()
     def pipelines = [
       pipelineBuilder('1').disabled(false).triggers([
-        new Trigger.TriggerBuilder().id('1').type(Trigger.Type.CRON.toString()).cronExpression('* 0/30 * * * ? *').enabled(true).build(),
+        theTriggeringTrigger,
         new Trigger.TriggerBuilder().id('2').type(Trigger.Type.JENKINS.toString()).enabled(true).build()
       ]).build(),
       pipelineBuilder('2').disabled(true).triggers([
@@ -84,7 +85,7 @@ class MissedPipelineTriggerCompensationJobSpec extends Specification {
         new OrcaService.PipelineResponse(pipelineConfigId: '4', startTime: getDateOffset(30).time)
       ]
     }
-    1 * pipelineInitiator.call((Pipeline) pipelines[0])
+    1 * pipelineInitiator.call((Pipeline) pipelines[0].withTrigger(theTriggeringTrigger))
     0 * orcaService._
     0 * pipelineInitiator._
   }