From c95df68637126816a7a06edb424789daf76857a3 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Fri, 2 Jul 2021 07:29:09 +0200 Subject: [PATCH] Merge bitcoin/bitcoin#22388: ci: use Ubuntu 20.04 as the default Docker container 7fc1e14ce60d4e0533c7ccc65a9b24052d7a608f ci: use Ubuntu 20.04 as the default Docker container (fanquake) Pull request description: All but 2 of the Ubuntu CIs (native qt5 & nowallet) are already using 20.04 or 21.04. ACKs for top commit: MarcoFalke: cr ACK 7fc1e14ce60d4e0533c7ccc65a9b24052d7a608f Tree-SHA512: f35d79a87af6c6955695b5e627884f94aed19bafaed4657d03ef4db66cf47cae5311464bb39961570140325652941283b9d88dff862776e8becfff9130162917 --- ci/test/00_setup_env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/test/00_setup_env.sh b/ci/test/00_setup_env.sh index 3d0ee4f6c2..0db0f0b459 100755 --- a/ci/test/00_setup_env.sh +++ b/ci/test/00_setup_env.sh @@ -50,7 +50,7 @@ export RUN_SYMBOL_TESTS=${RUN_SYMBOL_TESTS:-false} export EXPECTED_TESTS_DURATION_IN_SECONDS=${EXPECTED_TESTS_DURATION_IN_SECONDS:-1000} export CONTAINER_NAME=${CONTAINER_NAME:-ci_unnamed} -export DOCKER_NAME_TAG=${DOCKER_NAME_TAG:-ubuntu:focal} +export DOCKER_NAME_TAG=${DOCKER_NAME_TAG:-ubuntu:20.04} # Randomize test order. # See https://www.boost.org/doc/libs/1_71_0/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/random.html export BOOST_TEST_RANDOM=${BOOST_TEST_RANDOM:-1}