forked from hyperledger/besu
-
Notifications
You must be signed in to change notification settings - Fork 58
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# Conflicts: # .github/workflows/acceptance-tests.yml # .github/workflows/artifacts.yml # besu/src/main/java/org/hyperledger/besu/controller/BesuController.java # build.gradle # ethereum/evmtool/build.gradle
- Loading branch information
Showing
1,362 changed files
with
7,202 additions
and
6,044 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| name: docker develop | ||
|
|
||
| on: | ||
| push: | ||
| branches: | ||
| - main | ||
| env: | ||
| registry: docker.io | ||
|
|
||
| jobs: | ||
| hadolint: | ||
| runs-on: ubuntu-22.04 | ||
| steps: | ||
| - name: Checkout Repo | ||
| uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 | ||
| - name: Set up Java | ||
| uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 17 | ||
| - name: setup gradle | ||
| uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1 | ||
| with: | ||
| cache-disabled: true | ||
|
|
||
| - name: hadoLint | ||
| run: docker run --rm -i hadolint/hadolint < docker/Dockerfile | ||
| buildDocker: | ||
| needs: hadolint | ||
| permissions: | ||
| contents: read | ||
| packages: write | ||
|
|
||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| platform: | ||
| - ubuntu-22.04 | ||
| - [self-hosted, ARM64] | ||
| runs-on: ${{ matrix.platform }} | ||
| steps: | ||
| - name: Prepare | ||
| id: prep | ||
| run: | | ||
| platform=${{ matrix.platform }} | ||
| if [ "$platform" = 'ubuntu-22.04' ]; then | ||
| echo "PLATFORM_PAIR=linux-amd64" >> $GITHUB_OUTPUT | ||
| echo "ARCH=amd64" >> $GITHUB_OUTPUT | ||
| else | ||
| echo "PLATFORM_PAIR=linux-arm64" >> $GITHUB_OUTPUT | ||
| echo "ARCH=arm64" >> $GITHUB_OUTPUT | ||
| fi | ||
| # Get the current date and time in the format YY.MM | ||
| DATE_TIME=$(date +"%y.%-m") | ||
| # Get the short SHA of the merge commit | ||
| SHORT_SHA=${GITHUB_SHA::7} | ||
| # Construct the build target name | ||
| BUILD_TARGET_NAME="${DATE_TIME}-develop-${SHORT_SHA}" | ||
| echo "Build Target Name: $BUILD_TARGET_NAME" | ||
| # Set the build target name as an environment variable | ||
| echo "BUILD_TARGET_NAME=${BUILD_TARGET_NAME}" >> $GITHUB_ENV | ||
| - name: Checkout Repo | ||
| uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 | ||
| - name: Set up Java | ||
| uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 17 | ||
| - name: setup gradle | ||
| uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1 | ||
| with: | ||
| cache-disabled: true | ||
| - name: install goss | ||
| run: | | ||
| mkdir -p docker/reports | ||
| curl -L https://github.com/aelsabbahy/goss/releases/download/v0.4.4/goss-${{ steps.prep.outputs.PLATFORM_PAIR }} -o ./docker/tests/goss-${{ steps.prep.outputs.PLATFORM_PAIR }} | ||
| - name: login to ${{ env.registry }} | ||
| uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d | ||
| with: | ||
| registry: ${{ env.registry }} | ||
| username: ${{ secrets.DOCKER_USER_RW }} | ||
| password: ${{ secrets.DOCKER_PASSWORD_RW }} | ||
| - name: build and test docker | ||
| uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1 | ||
| env: | ||
| architecture: ${{ steps.prep.outputs.ARCH }} | ||
| with: | ||
| cache-disabled: true | ||
| arguments: testDocker -PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }} -Pversion=${{ env.BUILD_TARGET_NAME}} -Prelease.releaseVersion=develop | ||
| - name: publish | ||
| env: | ||
| architecture: ${{ steps.prep.outputs.ARCH }} | ||
| run: ./gradlew --no-daemon dockerUpload -PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }} -Pversion=${{ env.BUILD_TARGET_NAME }} -Prelease.releaseVersion=develop | ||
| multiArch: | ||
| needs: buildDocker | ||
| runs-on: ubuntu-22.04 | ||
| permissions: | ||
| contents: read | ||
| packages: write | ||
| steps: | ||
| - name: Checkout Repo | ||
| uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 | ||
| - name: Set up Java | ||
| uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 | ||
| with: | ||
| distribution: temurin | ||
| java-version: 17 | ||
| - name: setup gradle | ||
| uses: gradle/actions/setup-gradle@9e899d11ad247ec76be7a60bc1cf9d3abbb9e7f1 | ||
| with: | ||
| cache-disabled: true | ||
| - name: login to ${{ env.registry }} | ||
| uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d | ||
| with: | ||
| registry: ${{ env.registry }} | ||
| username: ${{ secrets.DOCKER_USER_RW }} | ||
| password: ${{ secrets.DOCKER_PASSWORD_RW }} | ||
| - name: multi-arch docker | ||
| run: ./gradlew manifestDocker -PdockerOrgName=${{ env.registry }}/${{ secrets.DOCKER_ORG }} -Pversion=${{ env.BUILD_TARGET_NAME }} -Prelease.releaseVersion=develop |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| #!/bin/bash | ||
|
|
||
| REPORTS_DIR="$1" | ||
| SPLIT_COUNT=$2 | ||
| SPLIT_INDEX=$3 | ||
|
|
||
| # extract tests time from Junit XML reports | ||
| find "$REPORTS_DIR" -type f -name TEST-*.xml | xargs -I{} bash -c "xmlstarlet sel -t -v 'sum(//testcase/@time)' '{}'; echo '{}' | sed 's/.*TEST\-\(.*\)\.xml/ \1/'" > tmp/timing.tsv | ||
|
|
||
| # Sort times in descending order | ||
| IFS=$'\n' sorted=($(sort -nr tmp/timing.tsv)) | ||
| unset IFS | ||
|
|
||
| sums=() | ||
| tests=() | ||
|
|
||
| # Initialize sums | ||
| for ((i=0; i<SPLIT_COUNT; i++)) | ||
| do | ||
| sums[$i]=0 | ||
| done | ||
|
|
||
| # add tests to groups trying to balance the sum of execution time of each group | ||
| for line in "${sorted[@]}"; do | ||
| line_parts=( $line ) | ||
| test_time=${line_parts[0]//./} # convert to millis | ||
| test_time=${test_time##0} # remove leading zeros | ||
| test_name=${line_parts[1]} | ||
|
|
||
| # Does the test still exists? | ||
| if grep -F -q --line-regexp "$test_name" tmp/currentTests.list | ||
| then | ||
| # Find index of min sum | ||
| idx_min_sum=0 | ||
| min_sum=${sums[0]} | ||
| for ((i=0; i<SPLIT_COUNT; i++)) | ||
| do | ||
| if [[ ${sums[$i]} -lt $min_sum ]] | ||
| then | ||
| idx_min_sum=$i | ||
| min_sum=${sums[$i]} | ||
| fi | ||
| done | ||
|
|
||
| # Add the test to the min sum list | ||
| min_sum_tests=${tests[$idx_min_sum]} | ||
| tests[$idx_min_sum]="${min_sum_tests}${test_name}," | ||
|
|
||
| # Update the sums | ||
| ((sums[idx_min_sum]+=test_time)) | ||
|
|
||
| echo "$test_name" >> tmp/processedTests.list | ||
| fi | ||
| done | ||
|
|
||
| # Any new test? | ||
| grep -F --line-regexp -v -f tmp/processedTests.list tmp/currentTests.list > tmp/newTests.list | ||
| idx_new_test=0 | ||
| while read -r new_test_name | ||
| do | ||
| idx_group=$(( idx_new_test % SPLIT_COUNT )) | ||
| group=${tests[$idx_group]} | ||
| tests[$idx_group]="${group}${new_test_name}," | ||
| idx_new_test=$(( idx_new_test + 1 )) | ||
| done < tmp/newTests.list | ||
|
|
||
|
|
||
| # return the requests index, without quotes to drop the last trailing space | ||
| echo ${tests[$SPLIT_INDEX]//,/ } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
.../java/org/hyperledger/besu/tests/acceptance/dsl/condition/eth/SyncingStatusCondition.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...g/hyperledger/besu/tests/acceptance/dsl/condition/priv/PrivateSyncingStatusCondition.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.