mirror of
https://github.com/ClickHouse/ClickHouse.git
synced 2024-09-20 00:30:49 +00:00
CI: Next fix for builds in CI workflow
This commit is contained in:
parent
a07707c56e
commit
983d2b474b
@ -48,24 +48,14 @@ class CI:
|
||||
JobNames.INTEGRATION_TEST_ARM,
|
||||
]
|
||||
),
|
||||
Tags.CI_SET_REQUIRED: LabelConfig(run_jobs=REQUIRED_CHECKS),
|
||||
Tags.CI_SET_REQUIRED: LabelConfig(
|
||||
run_jobs=REQUIRED_CHECKS
|
||||
+ [build for build in BuildNames if build != BuildNames.FUZZERS]
|
||||
),
|
||||
Tags.CI_SET_BUILDS: LabelConfig(
|
||||
run_jobs=[JobNames.STYLE_CHECK, JobNames.BUILD_CHECK]
|
||||
+ [build for build in BuildNames if build != BuildNames.FUZZERS]
|
||||
),
|
||||
Tags.CI_SET_NON_REQUIRED: LabelConfig(
|
||||
run_jobs=[job for job in JobNames if job not in REQUIRED_CHECKS]
|
||||
),
|
||||
Tags.CI_SET_OLD_ANALYZER: LabelConfig(
|
||||
run_jobs=[
|
||||
JobNames.STYLE_CHECK,
|
||||
JobNames.FAST_TEST,
|
||||
BuildNames.PACKAGE_RELEASE,
|
||||
BuildNames.PACKAGE_ASAN,
|
||||
JobNames.STATELESS_TEST_OLD_ANALYZER_S3_REPLICATED_RELEASE,
|
||||
JobNames.INTEGRATION_TEST_ASAN_OLD_ANALYZER,
|
||||
]
|
||||
),
|
||||
Tags.CI_SET_SYNC: LabelConfig(
|
||||
run_jobs=[
|
||||
BuildNames.PACKAGE_ASAN,
|
||||
|
@ -102,8 +102,6 @@ class Tags(metaclass=WithIter):
|
||||
CI_SET_ARM = "ci_set_arm"
|
||||
CI_SET_REQUIRED = "ci_set_required"
|
||||
CI_SET_BUILDS = "ci_set_builds"
|
||||
CI_SET_NON_REQUIRED = "ci_set_non_required"
|
||||
CI_SET_OLD_ANALYZER = "ci_set_old_analyzer"
|
||||
|
||||
libFuzzer = "libFuzzer"
|
||||
|
||||
|
@ -160,11 +160,8 @@ class CiSettings:
|
||||
else:
|
||||
return False
|
||||
|
||||
if CI.is_build_job(job):
|
||||
print(f"Build job [{job}] - always run")
|
||||
return True
|
||||
|
||||
if self.exclude_keywords:
|
||||
# do not exclude builds
|
||||
if self.exclude_keywords and not CI.is_build_job(job):
|
||||
for keyword in self.exclude_keywords:
|
||||
if keyword in normalize_string(job):
|
||||
print(f"Job [{job}] matches Exclude keyword [{keyword}] - deny")
|
||||
@ -172,7 +169,8 @@ class CiSettings:
|
||||
|
||||
to_deny = False
|
||||
if self.include_keywords:
|
||||
if job == CI.JobNames.STYLE_CHECK:
|
||||
# do not exclude builds
|
||||
if job == CI.JobNames.STYLE_CHECK or CI.is_build_job(job):
|
||||
# never exclude Style Check by include keywords
|
||||
return True
|
||||
for keyword in self.include_keywords:
|
||||
|
@ -8,8 +8,8 @@ from ci_config import CI
|
||||
|
||||
_TEST_BODY_1 = """
|
||||
#### Run only:
|
||||
- [x] <!---ci_set_non_required--> Non required
|
||||
- [ ] <!---ci_set_arm--> Integration tests (arm64)
|
||||
- [ ] <!---ci_set_required--> Some Set
|
||||
- [x] <!---ci_set_arm--> Integration tests (arm64)
|
||||
- [x] <!---ci_include_foo--> Integration tests
|
||||
- [x] <!---ci_include_foo_Bar--> Integration tests
|
||||
- [ ] <!---ci_include_bar--> Integration tests
|
||||
@ -149,7 +149,7 @@ class TestCIOptions(unittest.TestCase):
|
||||
self.assertFalse(ci_options.no_ci_cache)
|
||||
self.assertTrue(ci_options.no_merge_commit)
|
||||
self.assertTrue(ci_options.woolen_wolfdog)
|
||||
self.assertEqual(ci_options.ci_sets, ["ci_set_non_required"])
|
||||
self.assertEqual(ci_options.ci_sets, ["ci_set_arm"])
|
||||
self.assertCountEqual(ci_options.include_keywords, ["foo", "foo_bar"])
|
||||
self.assertCountEqual(ci_options.exclude_keywords, ["foo", "foo_bar"])
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user