Skip to content

Commit fd5c707

Browse files
authored
Merge pull request ClickHouse#78458 from ClickHouse/ci_add_ch_logs_into_ft_output
CI: Fast tests: add server logs
2 parents bba26c5 + f0b0a4a commit fd5c707

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

ci/jobs/fast_test.py

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,10 @@ def main():
136136
f"NOTE: It's a local run and clickhouse binary is not found [{clickhouse_bin_path}] - will be built"
137137
)
138138
time.sleep(5)
139+
clickhouse_server_link = Path(f"{build_dir}/programs/clickhouse-server")
140+
if not clickhouse_server_link.is_file():
141+
Shell.check(f"ln -sf {clickhouse_bin_path} {clickhouse_server_link}")
142+
Shell.check(f"chmod +x {clickhouse_bin_path}")
139143

140144
Utils.add_to_PATH(f"{build_dir}/programs:{current_directory}/tests")
141145

@@ -186,8 +190,6 @@ def main():
186190
if res and JobStages.BUILD in stages:
187191
commands = [
188192
f"mkdir -p {Settings.OUTPUT_DIR}/binaries",
189-
f"cp ./programs/clickhouse {Settings.OUTPUT_DIR}/binaries/clickhouse",
190-
f"zstd --threads=0 --force programs/clickhouse-stripped -o {Settings.OUTPUT_DIR}/binaries/clickhouse-stripped.zst",
191193
"sccache --show-stats",
192194
"clickhouse-client --version",
193195
"clickhouse-test --help",
@@ -232,9 +234,10 @@ def main():
232234
)
233235
if not results[-1].is_ok():
234236
attach_files.append(f"{temp_dir}/build/programs/clickhouse")
235-
attach_files.append(
236-
f"{temp_dir}/var/log/clickhouse-server/clickhouse-server.err.log"
237-
)
237+
attach_files += [
238+
f"{temp_dir}/var/log/clickhouse-server/clickhouse-server.err.log",
239+
f"{temp_dir}/var/log/clickhouse-server/clickhouse-server.log",
240+
]
238241

239242
if res and JobStages.TEST in stages:
240243
stop_watch_ = Utils.Stopwatch()
@@ -255,9 +258,10 @@ def main():
255258
)
256259
if not results[-1].is_ok():
257260
attach_files.append(f"{temp_dir}/build/programs/clickhouse")
258-
attach_files.append(
259-
f"{temp_dir}/var/log/clickhouse-server/clickhouse-server.err.log"
260-
)
261+
attach_files += [
262+
f"{temp_dir}/var/log/clickhouse-server/clickhouse-server.err.log",
263+
f"{temp_dir}/var/log/clickhouse-server/clickhouse-server.log",
264+
]
261265

262266
CH.terminate()
263267

0 commit comments

Comments
 (0)