Fix acceptance reports path and how to get the latest merged PR (#7147)

Signed-off-by: Fabio Di Fabio <[email protected]>
hyperledger · May 28, 2024 · 3c57ca2 · 3c57ca2
1 parent 7a5a3e0
commit 3c57ca2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -87,6 +87,8 @@ jobs:
           path: '*.txt'
       - name: run acceptance tests
         run: ./gradlew acceptanceTestNotPrivacy `cat gradleArgs.txt` -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
+      - name: Remove downloaded test results
+        run: rm -rf tmp/junit-xml-reports-downloaded
       - name: Upload Acceptance Test Results
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:

diff --git a/.github/workflows/pre-review.yml b/.github/workflows/pre-review.yml
@@ -143,6 +143,8 @@ jobs:
           path: testList.txt
       - name: run unit tests
         run: cat testList.txt | xargs -P 1 ./gradlew -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
+      - name: Remove downloaded test results
+        run: rm -rf tmp/junit-xml-reports-downloaded
       - name: Upload Unit Test Results
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:

diff --git a/.github/workflows/splitTestsByTime.sh b/.github/workflows/splitTestsByTime.sh
@@ -46,6 +46,12 @@ for line in "${sorted[@]}"; do
 	module_dir=${line_parts[2]}
 	test_with_module="$test_name $module_dir"
 
+  # temp deduplication during the transition phase
+  if grep -F -q --line-regexp "$test_with_module" tmp/processedTests.list
+  then
+    continue
+  fi
+
   # Does the test still exists?
   if grep -F -q --line-regexp "$test_with_module" tmp/currentTests.list
   then

diff --git a/.github/workflows/update-test-reports.yml b/.github/workflows/update-test-reports.yml
@@ -12,7 +12,7 @@ jobs:
     steps:
       - name: Get latest merge PR number
         id: latest_merged_pr_number
-        run: echo "PULL_REQUEST_NUMBER=$(gh pr list --repo hyperledger/besu --base main --state merged --limit 1 --json number | jq '.[].number')" >> "$GITHUB_OUTPUT"
+        run: echo "PULL_REQUEST_NUMBER=$(gh pr list --repo hyperledger/besu --base main --state merged --json "number,mergedAt" --search "sort:updated-desc" --jq 'max_by(.mergedAt)|.number')" >> "$GITHUB_OUTPUT"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Get unit test reports from latest merged PR
@@ -48,4 +48,4 @@ jobs:
         uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
           name: acceptance-test-results
-          path: 'acceptance-test-results/**/test-results/**/TEST-*.xml'
+          path: 'acceptance-test-results/**/TEST-*.xml'