From fa3df025e185ba664fd7bbc5f3cccb7da653f162 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 10 Nov 2018 12:15:21 -0500 Subject: [PATCH 1/2] travis: Avoid timeout on verify-commits check --- .travis/lint_06_script.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis/lint_06_script.sh b/.travis/lint_06_script.sh index 6191d825716..701e6d8005c 100755 --- a/.travis/lint_06_script.sh +++ b/.travis/lint_06_script.sh @@ -19,6 +19,7 @@ test/lint/check-rpc-mappings.py . test/lint/lint-all.sh if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then + git log --merges --before="2 days ago" -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit while read -r LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys && - travis_wait 50 contrib/verify-commits/verify-commits.py; + travis_wait 50 contrib/verify-commits/verify-commits.py --clean-merge=2; fi From fa5a6ce1022acf4722832490b1c6efb2b256e5ad Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 10 Nov 2018 13:14:40 -0500 Subject: [PATCH 2/2] qa: Raise ci test_runner timeout to 40 mins --- test/functional/test_runner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/functional/test_runner.py b/test/functional/test_runner.py index 90b333f45a7..ed7645e3331 100755 --- a/test/functional/test_runner.py +++ b/test/functional/test_runner.py @@ -365,7 +365,7 @@ def run_tests(*, test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage= tmpdir=tmpdir, test_list=test_list, flags=flags, - timeout_duration=20 * 60 if runs_ci else float('inf'), # in seconds + timeout_duration=40 * 60 if runs_ci else float('inf'), # in seconds ) start_time = time.time() test_results = []