Merge pull request #61881 from ClickHouse/ci_prepare_for_merge_queue

CI: merge queue support

.github/workflows/pull_request.yml

@@ -6,6 +6,7 @@ env:
   PYTHONUNBUFFERED: 1
 
 on:  # yamllint disable-line rule:truthy
+  merge_group:
   pull_request:
     types:
       - synchronize
@@ -29,6 +30,7 @@ jobs:
           fetch-depth: 0 # to get version
           filter: tree:0
       - name: Labels check
+        if: ${{ github.event_name != 'merge_group' }}
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 run_check.py
@@ -56,16 +58,9 @@ jobs:
               echo 'EOF'
             } >> "$GITHUB_OUTPUT"
       - name: Re-create GH statuses for skipped jobs if any
+        if: ${{ github.event_name != 'merge_group' }}
         run: |
             python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ runner.temp }}/ci_run_data.json --update-gh-statuses
-      - name: Style check early
-        # hack to run style check before the docker build job if possible (style-check image not changed)
-        if: contains(fromJson(steps.runconfig.outputs.CI_DATA).jobs_data.jobs_to_do, 'Style check early')
-        run: |
-          DOCKER_TAG=$(echo '${{ toJson(fromJson(steps.runconfig.outputs.CI_DATA).docker_data.images) }}' | tr -d '\n')
-          export DOCKER_TAG=$DOCKER_TAG
-          python3 ./tests/ci/style_check.py --no-push
-          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ runner.temp }}/ci_run_data.json --post --job-name 'Style check'
   BuildDockers:
     needs: [RunConfig]
     if: ${{ !failure() && !cancelled() && toJson(fromJson(needs.RunConfig.outputs.data).docker_data.missing_multi) != '[]' }}

tests/ci/ci.py

@@ -1033,22 +1033,6 @@ def _print_results(result: Any, outfile: Optional[str], pretty: bool = False) ->
             raise AssertionError(f"Unexpected type for 'res': {type(result)}")
 
 
-def _check_and_update_for_early_style_check(jobs_data: dict, docker_data: dict) -> None:
-    """
-    This is temporary hack to start style check before docker build if possible
-    FIXME: need better solution to do style check as soon as possible and as fast as possible w/o dependency on docker job
-    """
-    jobs_to_do = jobs_data.get("jobs_to_do", [])
-    docker_to_build = docker_data.get("missing_multi", [])
-    if (
-        JobNames.STYLE_CHECK in jobs_to_do
-        and docker_to_build
-        and "clickhouse/style-test" not in docker_to_build
-    ):
-        index = jobs_to_do.index(JobNames.STYLE_CHECK)
-        jobs_to_do[index] = "Style check early"
-
-
 def _update_config_for_docs_only(jobs_data: dict) -> None:
     DOCS_CHECK_JOBS = [JobNames.DOCS_CHECK, JobNames.STYLE_CHECK]
     print(f"NOTE: Will keep only docs related jobs: [{DOCS_CHECK_JOBS}]")
@@ -1306,6 +1290,12 @@ def _configure_jobs(
                 if params["num_batches"] > 1:
                     params["batches"] = list(requested_batches)
 
+    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,
@@ -1752,11 +1742,6 @@ def main() -> int:
             else {}
         )
 
-        # # FIXME: Early style check manipulates with job names might be not robust with await feature
-        # if pr_info.number != 0:
-        #     # FIXME: it runs style check before docker build if possible (style-check images is not changed)
-        #     #    find a way to do style check always before docker build and others
-        #     _check_and_update_for_early_style_check(jobs_data, docker_data)
         if not args.skip_jobs and pr_info.has_changes_in_documentation_only():
             _update_config_for_docs_only(jobs_data)
 

tests/ci/pr_info.py

@@ -215,6 +215,7 @@ class PRInfo:
                 .replace("{base}", base_sha)
                 .replace("{head}", self.sha)
             )
+            self.commit_html_url = f"{repo_prefix}/commits/{self.sha}"
 
         elif "commits" in github_event:
             self.event_type = EventType.PUSH