thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

try export dockerd.log

Browse Source
This commit is contained in:
Yatsishin Ilya 2021-03-23 14:35:45 +03:00
parent ecc58a76d7
commit e79b5b57fd
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/test/integration/runner/dockerd-entrypoint.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
set -e
dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 --default-address-pool base=10.0.0.0/8,size=24 &>/var/log/somefile &
dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 --default-address-pool base=10.10.0.0/16,size=24 &>/ClickHouse/tests/integration/dockerd.log &
set +e
reties=0

9
tests/integration/ci-runner.py
View File

@ -15,6 +15,7 @@ MAX_RETRY = 2
SLEEP_BETWEEN_RETRIES = 5
CLICKHOUSE_BINARY_PATH = "/usr/bin/clickhouse"
CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH = "/usr/bin/clickhouse-odbc-bridge"
DOCKERD_LOGS_PATH = "/ClickHouse/tests/integration/dockerd.log"
TRIES_COUNT = 10
MAX_TIME_SECONDS = 3600
@ -446,6 +447,10 @@ class ClickhouseIntegrationTestsRunner:
self._compress_logs("{}/tests/integration".format(repo_path), test_logs)
logging.info("Compression finished")
result_path_dockerd_logs = os.path.join(str(self.path()), "dockerd.log")
if os.path.exists(result_path_dockerd_logs):
shutil.copy(DOCKERD_LOGS_PATH, result_path_dockerd_logs)
test_result = []
for state in ("ERROR", "FAILED", "PASSED", "SKIPPED", "FLAKY"):
if state == "PASSED":
@ -518,6 +523,10 @@ class ClickhouseIntegrationTestsRunner:
self._compress_logs("{}/tests/integration".format(repo_path), test_logs)
logging.info("Compression finished")
result_path_dockerd_logs = os.path.join(str(self.path()), "dockerd.log")
if os.path.exists(result_path_dockerd_logs):
shutil.copy(DOCKERD_LOGS_PATH, result_path_dockerd_logs)
if counters["FAILED"] or counters["ERROR"]:
logging.info("Overall status failure, because we have tests in FAILED or ERROR state")
result_state = "failure"