From e0684dba6b153ba331f0ec79e6c74bb6645dd24e Mon Sep 17 00:00:00 2001
From: Max Kainov <max.kainov@clickhouse.com>
Date: Fri, 26 Apr 2024 14:57:16 +0000
Subject: [PATCH] CI: fix job config for MQ

---
 tests/ci/ci.py      | 13 +++----------
 tests/ci/pr_info.py |  2 +-
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/tests/ci/ci.py b/tests/ci/ci.py
index 14ec236759d..f97d5a658ad 100644
--- a/tests/ci/ci.py
+++ b/tests/ci/ci.py
@@ -1365,10 +1365,9 @@ def _configure_jobs(
         batches_to_do: List[int] = []
         add_to_skip = False
 
-        if job_config.pr_only and (
-            pr_info.is_release_branch and not pr_info.is_merge_queue
-        ):
-            # run only in PR's wf and in the MQ wf
+        if pr_info.is_merge_queue and job not in MQ_JOBS:
+            continue
+        if job_config.pr_only and pr_info.is_release_branch:
             continue
         if job_config.release_only and not pr_info.is_release_branch:
             continue
@@ -1449,12 +1448,6 @@ def _configure_jobs(
         jobs_to_do, jobs_to_skip, jobs_params
     )
 
-    if pr_info.is_merge_queue:
-        # FIXME: Quick support for MQ workflow which is only StyleCheck for now
-        jobs_to_do = [JobNames.STYLE_CHECK]
-        jobs_to_skip = []
-        print(f"NOTE: This is Merge Queue CI: set jobs to do: [{jobs_to_do}]")
-
     return {
         "digests": digests,
         "jobs_to_do": jobs_to_do,
diff --git a/tests/ci/pr_info.py b/tests/ci/pr_info.py
index afe4e2b87b0..975e560437a 100644
--- a/tests/ci/pr_info.py
+++ b/tests/ci/pr_info.py
@@ -318,7 +318,7 @@ class PRInfo:
 
     @property
     def is_release_branch(self) -> bool:
-        return self.number == 0
+        return self.number == 0 and not self.is_merge_queue
 
     @property
     def is_pr(self):