From 11f3e406c6ab040cc42d209ac2471406367f577c Mon Sep 17 00:00:00 2001
From: Max K <maxkaynov@gmail.com>
Date: Sat, 13 Jul 2024 12:48:48 +0200
Subject: [PATCH] CI: Cache AST fuzzers (run always) jobs in CI

---
 tests/ci/ci.py             | 4 ++--
 tests/ci/ci_cache.py       | 4 ++--
 tests/ci/ci_definitions.py | 9 ++++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/tests/ci/ci.py b/tests/ci/ci.py
index 32b87698395..57552985f62 100644
--- a/tests/ci/ci.py
+++ b/tests/ci/ci.py
@@ -325,8 +325,8 @@ def _mark_success_action(
         # do nothing, exit without failure
         print(f"ERROR: no status file for job [{job}]")
 
-    if job_config.run_always or job_config.run_by_label:
-        print(f"Job [{job}] runs always or by label in CI - do not cache")
+    if job_config.run_by_label or not job_config.has_digest():
+        print(f"Job [{job}] has no digest or run by label in CI - do not cache")
     else:
         if pr_info.is_master:
             pass
diff --git a/tests/ci/ci_cache.py b/tests/ci/ci_cache.py
index 291ed56aeea..bc6761959b4 100644
--- a/tests/ci/ci_cache.py
+++ b/tests/ci/ci_cache.py
@@ -609,7 +609,7 @@ class CiCache:
         pushes pending records for all jobs that supposed to be run
         """
         for job, job_config in self.jobs_to_do.items():
-            if job_config.run_always:
+            if not job_config.has_digest():
                 continue
             pending_state = PendingState(time.time(), run_url=GITHUB_RUN_URL)
             assert job_config.batches
@@ -680,7 +680,7 @@ class CiCache:
         It removes jobs from @jobs_to_do if it is a:
          1. test job and it is in @jobs_to_wait (no need to wait not affected jobs in PRs)
          2. test job and it has finished on release branch (even if failed)
-         2. build job which is not required by any test job that is left in @jobs_to_do
+         3. build job which is not required by any test job that is left in @jobs_to_do
 
         :return:
         """
diff --git a/tests/ci/ci_definitions.py b/tests/ci/ci_definitions.py
index 4ae252560e9..a79097d8b55 100644
--- a/tests/ci/ci_definitions.py
+++ b/tests/ci/ci_definitions.py
@@ -327,6 +327,9 @@ class JobConfig:
         assert self.required_builds
         return self.required_builds[0]
 
+    def has_digest(self) -> bool:
+        return self.digest != DigestConfig()
+
 
 class CommonJobConfigs:
     """
@@ -440,7 +443,11 @@ class CommonJobConfigs:
     )
     ASTFUZZER_TEST = JobConfig(
         job_name_keyword="ast",
-        digest=DigestConfig(),
+        digest=DigestConfig(
+            include_paths=[
+                "./tests/ci/ast_fuzzer_check.py",
+            ],
+            docker=["clickhouse/fuzzer"]),
         run_command="ast_fuzzer_check.py",
         run_always=True,
         runner_type=Runners.FUZZER_UNIT_TESTER,