diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 5f318d2cf..cc4aeada9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -12,13 +12,14 @@ jobs: steps: - uses: actions/checkout@v4 - id: set-matrix - run: echo "::set-output name=matrix::$(ls ./.github/tests/*.yaml | jq -R -s -c 'split("\n")[:-1]')" + run: echo "matrix=$(ls ./.github/tests/*.yaml | jq -R -s -c 'split("\n")[:-1]')" >> $GITHUB_OUTPUT run_with_args: needs: list-yamls strategy: matrix: file_name: ${{ fromJson(needs.list-yamls.outputs.matrix) }} runs-on: ubuntu-latest + continue-on-error: true steps: - name: Checkout Repository uses: actions/checkout@v4 @@ -32,3 +33,12 @@ jobs: - name: Run Starlark run: kurtosis run ${{ github.workspace }} --args-file ${{ matrix.file_name }} + + - name: Notify + if: cancelled() || failure() + uses: Ilshidur/action-discord@master + env: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }} + with: + args: "The nightly test for ${{matrix.file_name}} on ethereum-package has failed find it here ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" + diff --git a/.github/workflows/per-pr.yml b/.github/workflows/per-pr.yml index 562d527ad..3834b3200 100644 --- a/.github/workflows/per-pr.yml +++ b/.github/workflows/per-pr.yml @@ -52,7 +52,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout Repository - uses: actions/checkout@v2 + uses: actions/checkout@v4 - name: Setup Kurtosis run: | diff --git a/README.md b/README.md index a4e7fdd84..87b722e12 100644 --- a/README.md +++ b/README.md @@ -548,6 +548,8 @@ When you're happy with your changes: 1. Add one of the maintainers of the repo as a "Review Request": * `parithosh` (Ethereum Foundation) * `barnabasbusa` (Ethereum Foundation) + * `pk910` (Ethereum Foundation) + * `samcm` (Ethereum Foundation) * `h4ck3rk3y` (Kurtosis) * `mieubrisse` (Kurtosis) * `leederek` (Kurtosis) diff --git a/src/el/besu/besu_launcher.star b/src/el/besu/besu_launcher.star index 9500503dd..da2b26a80 100644 --- a/src/el/besu/besu_launcher.star +++ b/src/el/besu/besu_launcher.star @@ -29,7 +29,7 @@ TCP_DISCOVERY_PORT_ID = "tcp-discovery" UDP_DISCOVERY_PORT_ID = "udp-discovery" ENGINE_HTTP_RPC_PORT_ID = "engine-rpc" METRICS_PORT_ID = "metrics" - +JAVA_OPTS = {"JAVA_OPTS": "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n"} PRIVATE_IP_ADDRESS_PLACEHOLDER = "KURTOSIS_IP_ADDR_PLACEHOLDER" USED_PORTS = { @@ -187,6 +187,7 @@ def get_config( cmd_str = " ".join(cmd) + extra_env_vars = extra_env_vars | JAVA_OPTS return ServiceConfig( image=image, ports=USED_PORTS, @@ -194,13 +195,13 @@ def get_config( files={ constants.GENESIS_DATA_MOUNTPOINT_ON_CLIENTS: el_cl_genesis_data.files_artifact_uuid, }, + env_vars=extra_env_vars, entrypoint=ENTRYPOINT_ARGS, private_ip_address_placeholder=PRIVATE_IP_ADDRESS_PLACEHOLDER, min_cpu=el_min_cpu, max_cpu=el_max_cpu, min_memory=el_min_mem, max_memory=el_max_mem, - env_vars=extra_env_vars, labels=shared_utils.label_maker( constants.EL_CLIENT_TYPE.besu, constants.CLIENT_TYPES.el, diff --git a/src/package_io/input_parser.star b/src/package_io/input_parser.star index 4d11828a6..26c171d1c 100644 --- a/src/package_io/input_parser.star +++ b/src/package_io/input_parser.star @@ -8,7 +8,7 @@ DEFAULT_EL_IMAGES = { "geth": "ethereum/client-go:latest", "erigon": "ethpandaops/erigon:devel", "nethermind": "nethermind/nethermind:latest", - "besu": "hyperledger/besu:develop", + "besu": "hyperledger/besu:latest", "reth": "ghcr.io/paradigmxyz/reth", "ethereumjs": "ethpandaops/ethereumjs:master", }