Merge pull request #21 from jflo/gha_checks

versions

Author: jflo

.circleci/config.yml

@@ -2,16 +2,17 @@ name: acceptance-tests
 on:
   pull_request_review:
     types: [ submitted ]
+  workflow_dispatch:
+
 
 
 env:
   GRADLE_OPTS: "-Xmx6g -Dorg.gradle.daemon=false"
-  total-runners: 6
+  total-runners: 32
 
 jobs:
   runner-indexes:
-    runs-on:
-      group: "Besu Large Runners"
+    runs-on: ubuntu-22.04
     name: Generate runner indexes
     outputs:
       json: ${{ steps.generate-index-list.outputs.json }}
@@ -23,12 +24,11 @@ jobs:
           INDEX_JSON=$(jq --null-input --compact-output '. |= [inputs]' <<< ${INDEX_LIST})
           echo "::set-output name=json::${INDEX_JSON}"
   acceptanceTestEthereum:
-    runs-on:
-      group: "Besu Large Runners"
+    runs-on: ubuntu-22.04
     name: "Acceptance Runner #${{ matrix.runner-index }}: Run acceptance tests in parallel"
     needs:
       - runner-indexes
-    if: ${{ github.actor != 'dependabot[bot]'}}
+    if: ${{ github.actor != 'dependabot[bot]' && github.event.review.state == 'approved'}}
     strategy:
       fail-fast: false
       matrix:
@@ -41,13 +41,8 @@ jobs:
         with:
           distribution: adopt
           java-version: 17
-          cache: gradle
       - name: Compile
         uses: gradle/gradle-build-action@v2
-        with:
-          gradle-home-cache-cleanup: true
-          cache-read-only: false
-          arguments: compileJava compileTestJava -Dorg.gradle.parallel=true
       - name: Split tests
         id: split-tests
         uses: chaosaffe/split-tests@v1-alpha.1
@@ -62,10 +57,8 @@ jobs:
         #regex means: first truncate file paths to align with package name, then swap path delimiter with package delimiter,
         #then drop file extension, then insert --tests option between each.
         run: cat testList.txt | sed -e 's@acceptance-tests/tests/src/test/java/@@g' -e 's@/@.@g' -e 's/\.java//g' -e 's/\ /\ --tests\ /g' >> gradleArgs.txt
-      - name: list keystores
-        run: find . -name "*.jks"
       - name: run acceptance tests
-        run: ./gradlew acceptanceTest --tests `cat gradleArgs.txt`
+        run: ./gradlew acceptanceTest --tests `cat gradleArgs.txt` -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
       - name: cleanup tempfiles
         run: rm testList.txt gradleArgs.txt
       - name: Publish Test Report

.github/workflows/acceptance-tests.yml

@@ -2,6 +2,7 @@ name: pre-review
 
 on:
   pull_request:
+  workflow_dispatch:
 
 env:
   GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
@@ -51,13 +52,25 @@ jobs:
           java-version: 17
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2.10.0
-      - name: Run Build
+      - name: Gradle Compile
         run: ./gradlew build -x test -x spotlessCheck -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
   unitTests:
-    runs-on: besu-research-ubuntu-8
+    env:
+        GRADLEW_UNIT_TEST_ARGS: ${{matrix.gradle_args}}
+    runs-on: ubuntu-22.04
     needs: [ compile ]
     permissions:
       checks: write
+    strategy:
+      fail-fast: false
+      matrix:
+        gradle_args:
+          - "test -x besu:test -x consensus:test -x crypto:test -x ethereum:eth:test -x ethereum:api:test -x ethereum:core:test"
+          - "besu:test consensus:test crypto:test"
+          - "ethereum:api:testBonsai"
+          - "ethereum:api:testForest"
+          - "ethereum:api:testRemainder"
+          - "ethereum:core:test"
     steps:
       - name: Checkout Repo
         uses: actions/checkout@v3
@@ -67,8 +80,9 @@ jobs:
           distribution: adopt
           java-version: 17
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-        run: ./gradlew build -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
+        uses: gradle/gradle-build-action@v2.10.0
+      - name: run unit tests
+        run: ./gradlew $GRADLEW_UNIT_TEST_ARGS -Dorg.gradle.parallel=true -Dorg.gradle.caching=true
       - name: Upload Test Report
         uses: actions/upload-artifact@v3
         if: always() # always run even if the previous step fails

.github/workflows/callee.yml

@@ -168,3 +168,29 @@ tasks.register('generateTestBlockchain') {
   }
 }
 test.dependsOn(generateTestBlockchain)
+/*
+ Utility tasks used to separate out long running suites of tests so they can be parallelized in CI
+ */
+tasks.register("testBonsai", Test) {
+  useJUnitPlatform()
+  filter {
+    includeTestsMatching("org.hyperledger.besu.ethereum.api.jsonrpc.bonsai.*")
+  }
+  dependsOn(generateTestBlockchain)
+}
+
+tasks.register("testForest", Test) {
+  useJUnitPlatform()
+  filter {
+    includeTestsMatching("org.hyperledger.besu.ethereum.api.jsonrpc.forest.*")
+  }
+  dependsOn(generateTestBlockchain)
+}
+
+tasks.register("testRemainder", Test) {
+  useJUnitPlatform()
+  filter {
+    excludeTestsMatching("org.hyperledger.besu.ethereum.api.jsonrpc.bonsai.*")
+    excludeTestsMatching("org.hyperledger.besu.ethereum.api.jsonrpc.forest.*")
+  }
+}