Skip to content

Commit

Permalink
Cleanup transition steps used to update test reports on main (hyperle…
Browse files Browse the repository at this point in the history
…dger#7158)


Signed-off-by: Fabio Di Fabio <fabio.difabio@consensys.net>
  • Loading branch information
fab-10 authored May 30, 2024
1 parent d7c0289 commit 8128866
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 21 deletions.
13 changes: 2 additions & 11 deletions .github/workflows/acceptance-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ concurrency:

env:
GRADLE_OPTS: "-Xmx6g"
total-runners: 10
total-runners: 12

jobs:
acceptanceTestEthereum:
Expand All @@ -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
Expand All @@ -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
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/pre-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/splitTestsByTime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 8128866

Please sign in to comment.