Skip to content

Commit 4315b15

Browse files
committed
Merge remote-tracking branch 'u/master' into HEAD
2 parents 2c02e28 + 723ee87 commit 4315b15

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

ci/jobs/scripts/workflow_hooks/filter_job.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ def only_docs(changed_files):
1919
return True
2020

2121

22-
ONLY_DOCS_JOBS = [
22+
DO_NOT_TEST_JOBS = [
2323
JobNames.STYLE_CHECK,
2424
JobNames.DOCKER_BUILDS_ARM,
2525
JobNames.DOCKER_BUILDS_AMD,
26-
JobNames.Docs,
2726
]
2827

2928
PRELIMINARY_JOBS = [
@@ -56,10 +55,7 @@ def should_skip_job(job_name):
5655
print("WARNING: no changed files found for PR - do not filter jobs")
5756
return False, ""
5857

59-
if only_docs(changed_files) and job_name not in ONLY_DOCS_JOBS:
60-
return True, "Docs only update"
61-
62-
if Labels.DO_NOT_TEST in _info_cache.pr_labels and job_name not in ONLY_DOCS_JOBS:
58+
if Labels.DO_NOT_TEST in _info_cache.pr_labels and job_name not in DO_NOT_TEST_JOBS:
6359
return True, f"Skipped, labeled with '{Labels.DO_NOT_TEST}'"
6460

6561
if Labels.NO_FAST_TESTS in _info_cache.pr_labels and job_name in PRELIMINARY_JOBS:

tests/queries/0_stateless/03396_s3_do_not_retry_dns_errors.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/usr/bin/env bash
2-
# Tags: no-fasttest
2+
# Tags: no-fasttest, no-parallel
3+
# Tag no-fasttest - requires S3
4+
# Tag no-parallel - in case of parallel test DROP TABLE execution time is unpredictable (due to other tables can be queued for removal)
35

46
# Test from https://github.com/ClickHouse/ClickHouse/issues/68663
57

0 commit comments

Comments
 (0)