From 834f9d3a6ec00357efbb4e3b68813f281a71acff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= Date: Thu, 28 Oct 2021 12:46:34 +0200 Subject: [PATCH] Parallelize external test runs on CircleCI --- .circleci/config.yml | 2 ++ test/externalTests/colony.sh | 6 +++++- test/externalTests/common.sh | 9 +++++++++ test/externalTests/ens.sh | 6 +++++- test/externalTests/gnosis-v2.sh | 6 +++++- test/externalTests/gnosis.sh | 6 +++++- test/externalTests/zeppelin.sh | 6 +++++- 7 files changed, 36 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 72434ea15c96..02787debc4d7 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -943,6 +943,8 @@ jobs: default: 14 docker: - image: circleci/node:<> + # NOTE: Each external test does 3 separate compile&test runs + parallelism: 3 environment: TERM: xterm COMPILE_ONLY: <> diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh index e32385af65df..3aaff4413857 100755 --- a/test/externalTests/colony.sh +++ b/test/externalTests/colony.sh @@ -38,6 +38,10 @@ function colony_test local min_optimizer_level=3 local max_optimizer_level=3 + local selected_optimizer_levels + selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")") + print_optimizer_levels_or_exit "$selected_optimizer_levels" + setup_solcjs "$DIR" "$SOLJSON" download_project "$repo" "$branch" "$DIR" @@ -54,7 +58,7 @@ function colony_test replace_version_pragmas force_solc_modules "${DIR}/solc" - for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do + for level in $selected_optimizer_levels; do truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn done } diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh index dbda3c3f463b..2519a0f878e5 100644 --- a/test/externalTests/common.sh +++ b/test/externalTests/common.sh @@ -24,6 +24,15 @@ set -e CURRENT_EVM_VERSION=london +function print_optimizer_levels_or_exit +{ + local selected_levels="$1" + + [[ $selected_levels != "" ]] || { printWarning "No steps to run. Exiting."; exit 0; } + + printLog "Selected optimizer levels: ${selected_levels}" +} + function verify_input { if [ ! -f "$1" ]; then diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh index bbdc573e2110..9fed91be1fa1 100755 --- a/test/externalTests/ens.sh +++ b/test/externalTests/ens.sh @@ -38,6 +38,10 @@ function ens_test local min_optimizer_level=1 local max_optimizer_level=3 + local selected_optimizer_levels + selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")") + print_optimizer_levels_or_exit "$selected_optimizer_levels" + setup_solcjs "$DIR" "$SOLJSON" download_project "$repo" "$branch" "$DIR" @@ -52,7 +56,7 @@ function ens_test replace_version_pragmas force_solc_modules "${DIR}/solc" - for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do + for level in $selected_optimizer_levels; do truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn done } diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh index d92bcc1868e5..439a3dd91f65 100755 --- a/test/externalTests/gnosis-v2.sh +++ b/test/externalTests/gnosis-v2.sh @@ -39,6 +39,10 @@ function gnosis_safe_test local min_optimizer_level=2 local max_optimizer_level=3 + local selected_optimizer_levels + selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")") + print_optimizer_levels_or_exit "$selected_optimizer_levels" + setup_solcjs "$DIR" "$SOLJSON" download_project "$repo" "$branch" "$DIR" @@ -53,7 +57,7 @@ function gnosis_safe_test replace_version_pragmas force_solc_modules "${DIR}/solc" - for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do + for level in $selected_optimizer_levels; do truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn done } diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh index b6d9ab0bcb39..32b76d9c90dd 100755 --- a/test/externalTests/gnosis.sh +++ b/test/externalTests/gnosis.sh @@ -38,6 +38,10 @@ function gnosis_safe_test local min_optimizer_level=2 local max_optimizer_level=3 + local selected_optimizer_levels + selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")") + print_optimizer_levels_or_exit "$selected_optimizer_levels" + setup_solcjs "$DIR" "$SOLJSON" download_project "$repo" "$branch" "$DIR" @@ -51,7 +55,7 @@ function gnosis_safe_test replace_version_pragmas force_solc_modules "${DIR}/solc" - for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do + for level in $selected_optimizer_levels; do truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn done } diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh index 1e23bb7ae5ef..24e576b9313a 100755 --- a/test/externalTests/zeppelin.sh +++ b/test/externalTests/zeppelin.sh @@ -38,6 +38,10 @@ function zeppelin_test local min_optimizer_level=1 local max_optimizer_level=3 + local selected_optimizer_levels + selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")") + print_optimizer_levels_or_exit "$selected_optimizer_levels" + setup_solcjs "$DIR" "$SOLJSON" download_project "$repo" "$branch" "$DIR" @@ -48,7 +52,7 @@ function zeppelin_test replace_version_pragmas force_solc_modules "${DIR}/solc" - for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do + for level in $selected_optimizer_levels; do truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn done }