Skip to content

Commit e0c6bb7

Browse files
author
MarcoFalke
committed
Merge #14705: travis: Avoid timeout on verify-commits check
fa5a6ce qa: Raise ci test_runner timeout to 40 mins (MarcoFalke) fa3df02 travis: Avoid timeout on verify-commits check (MarcoFalke) Pull request description: The verify-commits check is too expensive to run in full (calculate Tree-SHA512 and clean-merge for every single merge commit in history) every day (the cron job runs every ~24h). Since the cron job is running every day, it is also redundant to redo most of the work on the next day. So, only check two days worth of commits and assume that travis checked the Tree-SHA512 and clean-merge for all other commits already. The script will still check all the signatures, since the check-result for them depends on external inputs such as current time or the public keys we got from the server. [Note that travis is not meant to do the verification for anyone or is meant to be trusted in any way. This check only serves as a belt-and-suspender to notify maintainers in case of a technical issue or script malfunction. But since the script is timing out for months now, its purpose is diminished right now.] Tree-SHA512: 336c5cbcc03cdf50be96cd61412471be9078d862da8ba2054f337441e062a6067c95fbbd03912e3de6a116f3caa75fd3f01a04864d34aae1489faa3154572815
2 parents 5d605b2 + fa5a6ce commit e0c6bb7

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.travis/lint_06_script.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ test/lint/check-rpc-mappings.py .
1919
test/lint/lint-all.sh
2020

2121
if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then
22+
git log --merges --before="2 days ago" -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit
2223
while read -r LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys &&
23-
travis_wait 50 contrib/verify-commits/verify-commits.py;
24+
travis_wait 50 contrib/verify-commits/verify-commits.py --clean-merge=2;
2425
fi

test/functional/test_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ def run_tests(*, test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage=
366366
tmpdir=tmpdir,
367367
test_list=test_list,
368368
flags=flags,
369-
timeout_duration=20 * 60 if runs_ci else float('inf'), # in seconds
369+
timeout_duration=40 * 60 if runs_ci else float('inf'), # in seconds
370370
)
371371
start_time = time.time()
372372
test_results = []

0 commit comments

Comments
 (0)