merge main

Signed-off-by: [email protected] <[email protected]>

.circleci/config.yml

@@ -4,14 +4,6 @@ orbs:
   win: circleci/[email protected]
 
 executors:
-  besu_executor_small:
-    docker:
-      - image: cimg/openjdk:17.0
-    resource_class: small
-    working_directory: ~/project
-    environment:
-      GRADLE_OPTS: -Dorg.gradle.daemon=false -Dorg.gradle.parallel=true -Dorg.gradle.workers.max=2
-
   besu_executor_med: # 2cpu, 4G ram
     docker:
       - image: cimg/openjdk:17.0
@@ -189,7 +181,7 @@ jobs:
       - capture_test_results
 
   integrationTests:
-    executor: xl_machine_executor
+    executor: xl_machine_executor # needs the machine executor since privacy test uses container tests (docker)
     steps:
       - prepare
       - attach_workspace:
@@ -220,7 +212,7 @@ jobs:
 
   acceptanceTests:
     parallelism: 4
-    executor: xl_machine_executor
+    executor: xl_machine_executor # needs the machine executor since privacy test uses container tests (docker)
     steps:
       - prepare
       - attach_workspace:
@@ -241,8 +233,7 @@ jobs:
       - capture_test_logs
 
   acceptanceTestsCliqueBft:
-    parallelism: 6
-    executor: xl_machine_executor
+    executor: besu_executor_xl
     steps:
       - prepare
       - attach_workspace:
@@ -251,20 +242,13 @@ jobs:
           name: AcceptanceTests (Non-Mainnet)
           no_output_timeout: 20m
           command: |
-            CLASSNAMES=$(circleci tests glob "acceptance-tests/tests/src/test/java/**/*.java" \
-              | sed 's@.*/src/test/java/@@' \
-              | sed 's@/@.@g' \
-              | sed 's/.\{5\}$//' \
-              | circleci tests split --split-by=timings --timings-type=classname)
-            # Format the arguments to "./gradlew test"
-            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}')
-            ./gradlew --no-daemon acceptanceTestCliqueBft $GRADLE_ARGS
+            ./gradlew --no-daemon acceptanceTestCliqueBft
       - capture_test_results
       - capture_test_logs
 
   acceptanceTestsPrivacy:
-    parallelism: 6
-    executor: xl_machine_executor
+    parallelism: 4
+    executor: xl_machine_executor # needs the machine executor since it uses container tests (docker)
     steps:
       - prepare
       - attach_workspace:
@@ -285,8 +269,7 @@ jobs:
       - capture_test_logs
 
   acceptanceTestsPermissioning:
-    parallelism: 6
-    executor: xl_machine_executor
+    executor: besu_executor_xl
     steps:
       - prepare
       - attach_workspace:
@@ -295,14 +278,7 @@ jobs:
           name: AcceptanceTests (Non-Mainnet)
           no_output_timeout: 20m
           command: |
-            CLASSNAMES=$(circleci tests glob "acceptance-tests/tests/src/test/java/**/*.java" \
-              | sed 's@.*/src/test/java/@@' \
-              | sed 's@/@.@g' \
-              | sed 's/.\{5\}$//' \
-              | circleci tests split --split-by=timings --timings-type=classname)
-            # Format the arguments to "./gradlew test"
-            GRADLE_ARGS=$(echo $CLASSNAMES | awk '{for (i=1; i<=NF; i++) print "--tests",$i}')
-            ./gradlew --no-daemon acceptanceTestPermissioning $GRADLE_ARGS
+            ./gradlew --no-daemon acceptanceTestPermissioning
       - capture_test_results
       - capture_test_logs
 
@@ -448,12 +424,11 @@ workflows:
       - acceptanceTestsCliqueBft:
           requires:
             - assemble
-      - acceptanceTestsPrivacy:
-          requires:
-            - assemble
+            - acceptanceTests
       - acceptanceTestsPermissioning:
           requires:
             - assemble
+            - acceptanceTestsCliqueBft
       - buildDocker:
           requires:
             - assemble
@@ -525,3 +500,6 @@ workflows:
     jobs:
       - assemble
       - dockerScan
+      - acceptanceTestsPrivacy:
+          requires:
+            - assemble

.github/workflows/checks.yml

@@ -7,11 +7,11 @@ on:
 
 jobs:
   spotless:
-    runs-on: [besu,Linux,self-hosted,X64,nodocker]
+    runs-on: [besu-research-ubuntu-16]
     if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
@@ -21,11 +21,11 @@ jobs:
       - name: spotless
         run: ./gradlew --no-daemon --parallel clean spotlessCheck
   javadoc_17:
-    runs-on: [besu,Linux,self-hosted,X64,nodocker]
+    runs-on: [besu-research-ubuntu-8]
     if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
       - name: Checkout Repo
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Java 17
         uses: actions/setup-java@v3
         with:

.github/workflows/codeql.yml

@@ -24,7 +24,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: [besu,Linux,self-hosted,X64,nodocker]
+    runs-on: [besu-research-ubuntu-16]
     permissions:
       actions: read
       contents: read
@@ -39,7 +39,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set up Java
       uses: actions/setup-java@v3

.github/workflows/dco-merge-group.yml

@@ -4,7 +4,7 @@ on:
 
 jobs:
   dco:
-    runs-on: [besu,Linux,self-hosted,nodocker]
+    runs-on: [besu-research-ubuntu-8]
     if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
-      - run: echo "This DCO job runs on merge_queue event and doesn't check PR contents"
+      - run: echo "This DCO job runs on merge_queue event and doesn't check PR contents"

.github/workflows/dco.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   dco:
-    runs-on: [besu,Linux,self-hosted,nodocker]
+    runs-on: [besu-research-ubuntu-8]
     if: ${{ github.actor != 'dependabot[bot]' }}
     steps:
       - run: echo "This DCO job runs on pull_request event and workflow_dispatch"
@@ -17,4 +17,4 @@ jobs:
       - name: DCO Check
         uses: tim-actions/[email protected]
         with:
-          commits: ${{ steps.get-pr-commits.outputs.commits }}
+          commits: ${{ steps.get-pr-commits.outputs.commits }}

.github/workflows/gradle-wrapper-validation.yml

@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
   validation:
     name: "Gradle Wrapper Validation"
-    runs-on: [besu,Linux,self-hosted,nodocker]
+    runs-on: [besu-research-ubuntu-8]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: gradle/wrapper-validation-action@v1

.github/workflows/pr-checklist-on-open.yml

@@ -6,7 +6,7 @@ on:
 jobs:
   checklist:
     name: "add checklist as a comment on newly opened PRs"
-    runs-on: [besu,Linux,self-hosted,nodocker]
+    runs-on: [besu-research-ubuntu-8]
     steps:
       - uses: actions/github-script@v5
         with:

.github/workflows/release.yml

@@ -4,9 +4,9 @@ on:
     types: released
 jobs:
   dockerPromoteX64:
-    runs-on: [besu,Linux,self-hosted,nodocker]
+    runs-on: [besu-research-ubuntu-16]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-java@v3
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options

.github/workflows/repolinter.yml

@@ -15,10 +15,10 @@ on:
 
 jobs:
   build:
-    runs-on: [besu,Linux,self-hosted,X64,docker]
+    runs-on: [besu-research-ubuntu-16]
     container: ghcr.io/todogroup/repolinter:v0.10.1
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Lint Repo
         run: bundle exec /app/bin/repolinter.js --rulesetUrl https://raw.githubusercontent.com/hyperledger-labs/hyperledger-community-management-tools/main/repo_structure/repolint.json --format markdown

.github/workflows/sonarcloud.yml

@@ -17,7 +17,7 @@ jobs:
     if: github.repository == 'hyperledger/besu'
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:

.gitignore

@@ -9,6 +9,7 @@
 .DS_Store
 .externalToolBuilders/
 .gradle/
+.vscode/
 .idea/
 .loadpath
 .metadata