From 812886660fd23413dc7c9ef8f609c13e9cd711cc Mon Sep 17 00:00:00 2001
From: Fabio Di Fabio <fabio.difabio@consensys.net>
Date: Thu, 30 May 2024 14:44:55 +0200
Subject: [PATCH] Cleanup transition steps used to update test reports on main
 (#7158)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
---
 .github/workflows/acceptance-tests.yml | 13 ++-----------
 .github/workflows/pre-review.yml       |  9 ---------
 .github/workflows/splitTestsByTime.sh  |  2 +-
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
index c188c9564e6..38a4272bdc4 100644
--- a/.github/workflows/acceptance-tests.yml
+++ b/.github/workflows/acceptance-tests.yml
@@ -12,7 +12,7 @@ concurrency:
 
 env:
   GRADLE_OPTS: "-Xmx6g"
-  total-runners: 10
+  total-runners: 12
 
 jobs:
   acceptanceTestEthereum:
@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        runner_index: [0,1,2,3,4,5,6,7,8,9]
+        runner_index: [0,1,2,3,4,5,6,7,8,9,10,11]
     steps:
       - name: Checkout Repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
@@ -45,15 +45,6 @@ jobs:
         run: ./gradlew acceptanceTestNotPrivacy --test-dry-run -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
       - name: Extract current test list
         run: mkdir tmp; find . -type f -name TEST-*.xml | xargs -I{} bash -c "xmlstarlet sel -t -v '/testsuite/@name' '{}'; echo ' acceptanceTestNotPrivacy'" | tee tmp/currentTests.list
-      - name: Get acceptance test reports (Support transition) # can be removed after PR is merged
-        uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d
-        continue-on-error: true
-        with:
-          branch: main
-          name_is_regexp: true
-          name: 'acceptance-node-\d+-test-results'
-          path: tmp/junit-xml-reports-downloaded
-          if_no_artifact_found: true
       - name: Get acceptance test reports
         uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d
         continue-on-error: true
diff --git a/.github/workflows/pre-review.yml b/.github/workflows/pre-review.yml
index 0628d2ee667..ce7d0e7c137 100644
--- a/.github/workflows/pre-review.yml
+++ b/.github/workflows/pre-review.yml
@@ -104,15 +104,6 @@ jobs:
         run: ./gradlew test --test-dry-run -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
       - name: Extract current test list
         run: mkdir tmp; find . -type f -name TEST-*.xml | xargs -I{} bash -c "xmlstarlet sel -t -v '/testsuite/@name' '{}'; echo '{}' | sed 's#\./\(.*\)/build/test-results/.*# \1#'" | tee tmp/currentTests.list
-      - name: Get unit test reports (Support transition) # can be removed after PR is merged
-        uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d
-        continue-on-error: true
-        with:
-          branch: main
-          name_is_regexp: true
-          name: 'unit-.*-test-results'
-          path: tmp/junit-xml-reports-downloaded
-          if_no_artifact_found: true
       - name: Get unit test reports
         uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d
         continue-on-error: true
diff --git a/.github/workflows/splitTestsByTime.sh b/.github/workflows/splitTestsByTime.sh
index 3ef075d6b97..219d2d74e78 100755
--- a/.github/workflows/splitTestsByTime.sh
+++ b/.github/workflows/splitTestsByTime.sh
@@ -46,7 +46,7 @@ for line in "${sorted[@]}"; do
 	module_dir=${line_parts[2]}
 	test_with_module="$test_name $module_dir"
 
-  # temp deduplication during the transition phase
+  # deduplication check to avoid executing a test multiple time
   if grep -F -q --line-regexp "$test_with_module" tmp/processedTests.list
   then
     continue