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

Fix azure tests run on master

Browse Source
This commit is contained in:
alesapin 2024-05-08 18:01:50 +02:00
parent 8c5af6abd6
commit bbb8cc0e93
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/ci/ci.py
View File

@ -849,6 +849,7 @@ class CiOptions:
jobs_to_do: List[str], jobs_to_do: List[str],
jobs_to_skip: List[str], jobs_to_skip: List[str],
jobs_params: Dict[str, Dict[str, Any]], jobs_params: Dict[str, Dict[str, Any]],
pr_info: PRInfo,
) -> Tuple[List[str], List[str], Dict[str, Dict[str, Any]]]: ) -> Tuple[List[str], List[str], Dict[str, Dict[str, Any]]]:
""" """
Applies specified options on CI Run Config Applies specified options on CI Run Config
@ -948,7 +949,8 @@ class CiOptions:
jobs_params[job] = { jobs_params[job] = {
"batches": list(range(num_batches)), "batches": list(range(num_batches)),
"num_batches": num_batches, "num_batches": num_batches,
"run_if_ci_option_include_set": job_config.run_by_ci_option, "run_if_ci_option_include_set": job_config.run_by_ci_option
and pr_info.is_pr,
} }
# 4. Handle "batch_" tags # 4. Handle "batch_" tags
@ -1439,7 +1441,8 @@ def _configure_jobs(
jobs_params[job] = { jobs_params[job] = {
"batches": batches_to_do, "batches": batches_to_do,
"num_batches": num_batches, "num_batches": num_batches,
"run_if_ci_option_include_set": job_config.run_by_ci_option, "run_if_ci_option_include_set": job_config.run_by_ci_option
and pr_info.is_pr,
} }
elif add_to_skip: elif add_to_skip:
# treat job as being skipped only if it's controlled by digest # treat job as being skipped only if it's controlled by digest
@ -1464,7 +1467,7 @@ def _configure_jobs(
] ]
jobs_to_do, jobs_to_skip, jobs_params = ci_options.apply( jobs_to_do, jobs_to_skip, jobs_params = ci_options.apply(
jobs_to_do, jobs_to_skip, jobs_params jobs_to_do, jobs_to_skip, jobs_params, pr_info
) )
return { return {

7
tests/ci/test_ci_options.py
View File

@ -4,6 +4,7 @@
import unittest import unittest
from ci import CiOptions from ci import CiOptions
from pr_info import PRInfo
_TEST_BODY_1 = """ _TEST_BODY_1 = """
#### Run only: #### Run only:
@ -164,7 +165,7 @@ class TestCIOptions(unittest.TestCase):
} }
} }
jobs_to_do, jobs_to_skip, job_params = ci_options.apply( jobs_to_do, jobs_to_skip, job_params = ci_options.apply(
jobs_to_do, jobs_to_skip, job_params jobs_to_do, jobs_to_skip, job_params, PRInfo()
) )
self.assertCountEqual( self.assertCountEqual(
jobs_to_do, jobs_to_do,
@ -196,7 +197,7 @@ class TestCIOptions(unittest.TestCase):
jobs_to_skip = [] jobs_to_skip = []
job_params = {} job_params = {}
jobs_to_do, jobs_to_skip, job_params = ci_options.apply( jobs_to_do, jobs_to_skip, job_params = ci_options.apply(
jobs_to_do, jobs_to_skip, job_params jobs_to_do, jobs_to_skip, job_params, PRInfo()
) )
self.assertCountEqual( self.assertCountEqual(
jobs_to_do, jobs_to_do,
@ -231,7 +232,7 @@ class TestCIOptions(unittest.TestCase):
job_params[job] = {"run_if_ci_option_include_set": False} job_params[job] = {"run_if_ci_option_include_set": False}
jobs_to_do, jobs_to_skip, job_params = ci_options.apply( jobs_to_do, jobs_to_skip, job_params = ci_options.apply(
jobs_to_do, jobs_to_skip, job_params jobs_to_do, jobs_to_skip, job_params, PRInfo()
) )
self.assertNotIn( self.assertNotIn(
"Stateless tests (azure, asan)", "Stateless tests (azure, asan)",