Cleanup transition steps used to update test reports on main (#7158)

Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
pull/7159/head
Fabio Di Fabio 5 months ago committed by GitHub
parent d7c028966d
commit 812886660f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 13
      .github/workflows/acceptance-tests.yml
  2. 9
      .github/workflows/pre-review.yml
  3. 2
      .github/workflows/splitTestsByTime.sh

@ -12,7 +12,7 @@ concurrency:
env: env:
GRADLE_OPTS: "-Xmx6g" GRADLE_OPTS: "-Xmx6g"
total-runners: 10 total-runners: 12
jobs: jobs:
acceptanceTestEthereum: acceptanceTestEthereum:
@ -24,7 +24,7 @@ jobs:
strategy: strategy:
fail-fast: true fail-fast: true
matrix: 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: steps:
- name: Checkout Repo - name: Checkout Repo
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
@ -45,15 +45,6 @@ jobs:
run: ./gradlew acceptanceTestNotPrivacy --test-dry-run -Dorg.gradle.parallel=true -Dorg.gradle.caching=true run: ./gradlew acceptanceTestNotPrivacy --test-dry-run -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
- name: Extract current test list - 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 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 - name: Get acceptance test reports
uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d
continue-on-error: true continue-on-error: true

@ -104,15 +104,6 @@ jobs:
run: ./gradlew test --test-dry-run -Dorg.gradle.parallel=true -Dorg.gradle.caching=true run: ./gradlew test --test-dry-run -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
- name: Extract current test list - 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 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 - name: Get unit test reports
uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d uses: dawidd6/action-download-artifact@e7466d1a7587ed14867642c2ca74b5bcc1e19a2d
continue-on-error: true continue-on-error: true

@ -46,7 +46,7 @@ for line in "${sorted[@]}"; do
module_dir=${line_parts[2]} module_dir=${line_parts[2]}
test_with_module="$test_name $module_dir" 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 if grep -F -q --line-regexp "$test_with_module" tmp/processedTests.list
then then
continue continue

Loading…
Cancel
Save