mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-11-21 23:21:59 +00:00
CI: MergeQueue: add binary_release and unit tests
This commit is contained in:
parent
23e461f5a4
commit
64d3a8417e
18
.github/workflows/merge_queue.yml
vendored
18
.github/workflows/merge_queue.yml
vendored
@ -80,11 +80,27 @@ jobs:
|
||||
run_command: |
|
||||
python3 fast_test_check.py
|
||||
|
||||
Builds_1:
|
||||
needs: [RunConfig, BuildDockers]
|
||||
if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Builds_1') }}
|
||||
# using callable wf (reusable_stage.yml) allows grouping all nested jobs under a tab
|
||||
uses: ./.github/workflows/reusable_build_stage.yml
|
||||
with:
|
||||
stage: Builds_1
|
||||
data: ${{ needs.RunConfig.outputs.data }}
|
||||
Tests_1:
|
||||
needs: [RunConfig, Builds_1]
|
||||
if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_1') }}
|
||||
uses: ./.github/workflows/reusable_test_stage.yml
|
||||
with:
|
||||
stage: Tests_1
|
||||
data: ${{ needs.RunConfig.outputs.data }}
|
||||
|
||||
################################# Stage Final #################################
|
||||
#
|
||||
FinishCheck:
|
||||
if: ${{ !failure() && !cancelled() }}
|
||||
needs: [RunConfig, BuildDockers, StyleCheck, FastTest]
|
||||
needs: [RunConfig, BuildDockers, StyleCheck, FastTest, Builds_1, Tests_1]
|
||||
runs-on: [self-hosted, style-checker-aarch64]
|
||||
steps:
|
||||
- name: Check out repository code
|
||||
|
@ -1215,7 +1215,9 @@ def _pre_action(s3, indata, pr_info):
|
||||
ci_cache = CiCache(s3, indata["jobs_data"]["digests"])
|
||||
|
||||
# for release/master branches reports must be from the same branch
|
||||
report_prefix = normalize_string(pr_info.head_ref) if pr_info.number == 0 else ""
|
||||
report_prefix = ""
|
||||
if pr_info.is_master or pr_info.is_release:
|
||||
report_prefix = normalize_string(pr_info.head_ref)
|
||||
print(
|
||||
f"Use report prefix [{report_prefix}], pr_num [{pr_info.number}], head_ref [{pr_info.head_ref}]"
|
||||
)
|
||||
@ -1374,7 +1376,12 @@ def _configure_jobs(
|
||||
|
||||
# FIXME: find better place for these config variables
|
||||
DOCS_CHECK_JOBS = [JobNames.DOCS_CHECK, JobNames.STYLE_CHECK]
|
||||
MQ_JOBS = [JobNames.STYLE_CHECK, JobNames.FAST_TEST]
|
||||
MQ_JOBS = [
|
||||
JobNames.STYLE_CHECK,
|
||||
JobNames.FAST_TEST,
|
||||
Build.BINARY_RELEASE,
|
||||
JobNames.UNIT_TEST,
|
||||
]
|
||||
# Must always calculate digest for these jobs for CI Cache to function (they define s3 paths where records are stored)
|
||||
REQUIRED_DIGESTS = [JobNames.DOCS_CHECK, Build.PACKAGE_RELEASE]
|
||||
if pr_info.has_changes_in_documentation_only():
|
||||
@ -1391,6 +1398,9 @@ def _configure_jobs(
|
||||
):
|
||||
# We still need digest for JobNames.DOCS_CHECK since CiCache depends on it (FIXME)
|
||||
continue
|
||||
if pr_info.is_master and job in MQ_JOBS:
|
||||
# On master - skip jobs that run in MQ
|
||||
continue
|
||||
if (
|
||||
pr_info.has_changes_in_documentation_only()
|
||||
and job not in DOCS_CHECK_JOBS
|
||||
|
Loading…
Reference in New Issue
Block a user