circus-evaluator: fix processing of restarted interval evaluations

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I119568674e31cc7597a040d926ac4cec6a6a6964

Author: NotAShelf

crates/evaluator/src/eval_loop.rs

@@ -9,6 +9,7 @@ use circus_common::{
     CreateJobset,
     Evaluation,
     EvaluationStatus,
+    EvaluationTriggerKind,
     JobsetInput,
     JobsetState,
     JobsetTriggerMode,
@@ -103,7 +104,7 @@ async fn run_cycle(
       continue;
     };
 
-    if jobset.trigger_mode.accepts_source_triggers() {
+    if accepts_pending_evaluation(jobset.trigger_mode, eval.trigger_kind) {
       pending_jobset_ids.insert(eval.jobset_id);
       pending_tasks.push((eval, jobset.clone()));
     } else {
@@ -221,6 +222,14 @@ async fn run_cycle(
   Ok(())
 }
 
+fn accepts_pending_evaluation(
+  trigger_mode: JobsetTriggerMode,
+  trigger_kind: EvaluationTriggerKind,
+) -> bool {
+  trigger_mode.accepts_source_triggers()
+    || trigger_kind == EvaluationTriggerKind::Interval
+}
+
 fn warn_on_disk_pressure(msg: &str) {
   let lower = msg.to_lowercase();
   if lower.contains("no space left on device")
@@ -970,3 +979,22 @@ async fn discover_projects_without_jobsets(
     sync_repo_declarative_config(pool, &repo_path, project.id).await;
   }
 }
+
+#[cfg(test)]
+mod tests {
+  use circus_common::models::{EvaluationTriggerKind, JobsetTriggerMode};
+
+  use super::accepts_pending_evaluation;
+
+  #[test]
+  fn interval_restarts_are_accepted_by_pending_queue() {
+    assert!(accepts_pending_evaluation(
+      JobsetTriggerMode::Interval,
+      EvaluationTriggerKind::Interval,
+    ));
+    assert!(!accepts_pending_evaluation(
+      JobsetTriggerMode::Interval,
+      EvaluationTriggerKind::Manual,
+    ));
+  }
+}