From d141f1d05ab00ba632118911b9371b942c836b3e Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Thu, 7 Dec 2023 11:31:47 +1000 Subject: [PATCH 1/3] Remove parallelism usage from mainnet AT Signed-off-by: Gabriel Fukushima --- .circleci/config.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bff2f447944..60513eba0b4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -211,7 +211,6 @@ jobs: - capture_test_results acceptanceTests: - parallelism: 2 executor: xl_machine_executor # needs the machine executor since privacy test uses container tests (docker) steps: - prepare @@ -221,13 +220,6 @@ jobs: name: AcceptanceTests (Mainnet) no_output_timeout: 20m command: | - CLASSNAMES=$(circleci tests glob "acceptance-tests/tests/src/test/java/**/*.java" \ - | sed 's@.*/src/test/java/@@' \ - | sed 's@/@.@g' \ - | sed 's/.\{5\}$//' \ - | circleci tests split --split-by=timings --timings-type=classname) - # Format the arguments to "./gradlew test" - GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}') ./gradlew --no-daemon acceptanceTestMainnet $GRADLE_ARGS - capture_test_results - capture_test_logs From 69bff89835a7044006bdd0b36c49d87041c4082e Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Thu, 7 Dec 2023 12:19:32 +1000 Subject: [PATCH 2/3] Increase parallelism usage from mainnet AT Signed-off-by: Gabriel Fukushima --- .circleci/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 60513eba0b4..c7c251d14a5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -211,6 +211,7 @@ jobs: - capture_test_results acceptanceTests: + parallelism: 4 executor: xl_machine_executor # needs the machine executor since privacy test uses container tests (docker) steps: - prepare From bc00432b78526e0da74ae9367ae17c2f724c94a4 Mon Sep 17 00:00:00 2001 From: Gabriel Fukushima Date: Thu, 7 Dec 2023 13:04:49 +1000 Subject: [PATCH 3/3] Add the split command back Signed-off-by: Gabriel Fukushima --- .circleci/config.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index c7c251d14a5..bcd81e45cbe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -221,6 +221,13 @@ jobs: name: AcceptanceTests (Mainnet) no_output_timeout: 20m command: | + CLASSNAMES=$(circleci tests glob "acceptance-tests/tests/src/test/java/**/*.java" \ + | sed 's@.*/src/test/java/@@' \ + | sed 's@/@.@g' \ + | sed 's/.\{5\}$//' \ + | circleci tests split --split-by=timings --timings-type=classname) + # Format the arguments to "./gradlew test" + GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}') ./gradlew --no-daemon acceptanceTestMainnet $GRADLE_ARGS - capture_test_results - capture_test_logs