thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

CI: Fix for filtering jobs in PRs

Browse Source
This commit is contained in:
Max Kainov 2024-08-08 09:48:12 +02:00
parent 3319a5e6f8
commit 59a63cd110
2 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/ci/ci_cache.py
View File

@ -731,7 +731,8 @@ class CiCache:
job_config=reference_config,
):
remove_from_workflow.append(job_name)
has_test_jobs_to_skip = True
if job_name != CI.JobNames.DOCS_CHECK:
has_test_jobs_to_skip = True
else:
required_builds += (
job_config.required_builds if job_config.required_builds else []

43
tests/ci/test_ci_config.py
View File

@ -642,7 +642,7 @@ class TestCIConfig(unittest.TestCase):
release_branch=True,
)
for record_t_, records_ in ci_cache.records.items():
if record_t_.value == CiCache.RecordType.FAILED.value:
if record_t_.value == record.record_type.value:
records_[record.to_str_key()] = record
ci_cache.filter_out_not_affected_jobs()
@ -716,7 +716,7 @@ class TestCIConfig(unittest.TestCase):
release_branch=True,
)
for record_t_, records_ in ci_cache.records.items():
if record_t_.value == CiCache.RecordType.FAILED.value:
if record_t_.value == record.record_type.value:
records_[record.to_str_key()] = record
ci_cache.filter_out_not_affected_jobs()
@ -726,3 +726,42 @@ class TestCIConfig(unittest.TestCase):
MOCK_REQUIRED_BUILDS,
)
self.assertCountEqual(list(ci_cache.jobs_to_do), expected_to_do)
def test_ci_py_filters_not_affected_jobs_in_prs_docs_check(self):
"""
checks ci.py filters not affected jobs in PRs,
Docs Check is special from ci_cache perspective -
check it ci pr pipline is filtered properly when only docs check is to be skipped
"""
settings = CiSettings()
settings.no_ci_cache = True
pr_info = PRInfo(github_event=_TEST_EVENT_JSON)
pr_info.event_type = EventType.PULL_REQUEST
pr_info.number = 123
assert pr_info.is_pr
ci_cache = CIPY._configure_jobs(
S3Helper(), pr_info, settings, skip_jobs=False, dry_run=True
)
self.assertTrue(not ci_cache.jobs_to_skip, "Must be no jobs in skip list")
assert not ci_cache.jobs_to_wait
assert not ci_cache.jobs_to_skip
job_config = ci_cache.jobs_to_do[CI.JobNames.DOCS_CHECK]
for batch in range(job_config.num_batches):
# add any record into cache
record = CiCache.Record(
record_type=CiCache.RecordType.PENDING,
job_name=CI.JobNames.DOCS_CHECK,
job_digest=ci_cache.job_digests[CI.JobNames.DOCS_CHECK],
batch=batch,
num_batches=job_config.num_batches,
release_branch=True,
)
for record_t_, records_ in ci_cache.records.items():
if record_t_.value == record.record_type.value:
records_[record.to_str_key()] = record
expected_jobs = list(ci_cache.jobs_to_do)
expected_jobs.remove(CI.JobNames.DOCS_CHECK)
ci_cache.filter_out_not_affected_jobs()
self.assertCountEqual(list(ci_cache.jobs_to_do), expected_jobs)