Skip to content

Commit 9a812fc

Browse files
authored
Revert "CI: Strict job timeout 1.5h for tests, 2h for builds"
1 parent de9cded commit 9a812fc

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

tests/ci/ci_config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -510,6 +510,7 @@ class CI:
510510
JobNames.LIBFUZZER_TEST: JobConfig(
511511
required_builds=[BuildNames.FUZZERS],
512512
run_by_label=Tags.libFuzzer,
513+
timeout=10800,
513514
run_command='libfuzzer_test_check.py "$CHECK_NAME"',
514515
runner_type=Runners.STYLE_CHECKER,
515516
),

tests/ci/ci_definitions.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ class JobConfig:
331331
# will be triggered for the job if omitted in CI workflow yml
332332
run_command: str = ""
333333
# job timeout, seconds
334-
timeout: Optional[int] = 5400
334+
timeout: Optional[int] = None
335335
# sets number of batches for a multi-batch job
336336
num_batches: int = 1
337337
# label that enables job in CI, if set digest isn't used
@@ -420,6 +420,7 @@ class CommonJobConfigs:
420420
),
421421
run_command='functional_test_check.py "$CHECK_NAME"',
422422
runner_type=Runners.FUNC_TESTER,
423+
timeout=9000,
423424
)
424425
STATEFUL_TEST = JobConfig(
425426
job_name_keyword="stateful",
@@ -530,6 +531,7 @@ class CommonJobConfigs:
530531
docker=["clickhouse/sqllogic-test"],
531532
),
532533
run_command="sqllogic_test.py",
534+
timeout=10800,
533535
release_only=True,
534536
runner_type=Runners.FUNC_TESTER,
535537
)
@@ -541,6 +543,7 @@ class CommonJobConfigs:
541543
docker=["clickhouse/sqltest"],
542544
),
543545
run_command="sqltest.py",
546+
timeout=10800,
544547
release_only=True,
545548
runner_type=Runners.FUZZER_UNIT_TESTER,
546549
)
@@ -610,7 +613,6 @@ class CommonJobConfigs:
610613
docker=["clickhouse/binary-builder"],
611614
git_submodules=True,
612615
),
613-
timeout=7200,
614616
run_command="build_check.py $BUILD_NAME",
615617
runner_type=Runners.BUILDER,
616618
)

0 commit comments

Comments
 (0)