From 3c57ca28218122fe0efe9ee6cf628d1133729214 Mon Sep 17 00:00:00 2001 From: Fabio Di Fabio Date: Tue, 28 May 2024 17:03:34 +0200 Subject: [PATCH] Fix acceptance reports path and how to get the latest merged PR (#7147) Signed-off-by: Fabio Di Fabio --- .github/workflows/acceptance-tests.yml | 2 ++ .github/workflows/pre-review.yml | 2 ++ .github/workflows/splitTestsByTime.sh | 6 ++++++ .github/workflows/update-test-reports.yml | 4 ++-- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index c05e4d5f4f..c188c9564e 100644 --- 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 index 034e0da2fe..0628d2ee66 100644 --- 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 index 0e39484441..3ef075d6b9 100755 --- 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 index cb57ac9716..fd0266dd5c 100644 --- 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'