From df75907ac4d60486fdf1193c9e414574c3c14ea1 Mon Sep 17 00:00:00 2001 From: Amir Date: Wed, 15 May 2024 11:58:54 -0700 Subject: [PATCH 1/7] Add kurtosis test runs to client-build workflow --- .github/workflows/client-build.yml | 10 ++++++++++ .github/workflows/kurtosis-args.yaml | 16 ++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 .github/workflows/kurtosis-args.yaml diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml index 065e7185e3..11853fae58 100644 --- a/.github/workflows/client-build.yml +++ b/.github/workflows/client-build.yml @@ -84,3 +84,13 @@ jobs: working-directory: ${{github.workspace}} - run: cd ${{github.workspace}}/packages/client && npx vitest run test/cli/cli + + assertoor: + runs-on: ubuntu-latest + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Kurtosis Assertoor GitHub Action + uses: ethpandaops/kurtosis-assertoor-github-action@v1 + with: + ethereum_package_args: ./kurtosis-args.yaml diff --git a/.github/workflows/kurtosis-args.yaml b/.github/workflows/kurtosis-args.yaml new file mode 100644 index 0000000000..d2757ba140 --- /dev/null +++ b/.github/workflows/kurtosis-args.yaml @@ -0,0 +1,16 @@ +participants: + - el_type: geth + cl_type: lighthouse + count: 1 + - el_type: geth + cl_type: lodestar + count: 1 +additional_services: + - assertoor + - dora +assertoor_params: + run_stability_check: false + run_block_proposal_check: false + tests: + - https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/block-proposal-check.yaml + - https://raw.githubusercontent.com/ethpandaops/assertoor-test/master/assertoor-tests/all-opcodes-test.yaml \ No newline at end of file From 0ebd26690991ffa79f2e78f503b5050b5edf6e1a Mon Sep 17 00:00:00 2001 From: acolytec3 <17355484+acolytec3@users.noreply.github.com> Date: Wed, 29 May 2024 14:53:10 -0400 Subject: [PATCH 2/7] Adjust path --- .github/workflows/client-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml index 11853fae58..f9985cf7b7 100644 --- a/.github/workflows/client-build.yml +++ b/.github/workflows/client-build.yml @@ -93,4 +93,4 @@ jobs: - name: Kurtosis Assertoor GitHub Action uses: ethpandaops/kurtosis-assertoor-github-action@v1 with: - ethereum_package_args: ./kurtosis-args.yaml + ethereum_package_args: ${{github.workspace}}/.github/workflows/kurtosis-args.yaml From 58d2a6cc9d79d26df4df7feade41f9bdd7985df3 Mon Sep 17 00:00:00 2001 From: acolytec3 <17355484+acolytec3@users.noreply.github.com> Date: Wed, 29 May 2024 14:53:42 -0400 Subject: [PATCH 3/7] Add ethereumjs client --- .github/workflows/kurtosis-args.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kurtosis-args.yaml b/.github/workflows/kurtosis-args.yaml index d2757ba140..76a03fdc39 100644 --- a/.github/workflows/kurtosis-args.yaml +++ b/.github/workflows/kurtosis-args.yaml @@ -2,7 +2,7 @@ participants: - el_type: geth cl_type: lighthouse count: 1 - - el_type: geth + - el_type: ethereumjs cl_type: lodestar count: 1 additional_services: From c4879ed0be89aa5f15c3030d588b05850f5e7222 Mon Sep 17 00:00:00 2001 From: acolytec3 <17355484+acolytec3@users.noreply.github.com> Date: Wed, 29 May 2024 16:30:24 -0400 Subject: [PATCH 4/7] Use local ethjs docker image --- .github/workflows/kurtosis-args.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/kurtosis-args.yaml b/.github/workflows/kurtosis-args.yaml index 76a03fdc39..be039a3990 100644 --- a/.github/workflows/kurtosis-args.yaml +++ b/.github/workflows/kurtosis-args.yaml @@ -3,6 +3,7 @@ participants: cl_type: lighthouse count: 1 - el_type: ethereumjs + el_image: ethereumjs:local cl_type: lodestar count: 1 additional_services: From ae631a44d0a282fc1e25dc0dc21e0ce831c6a5b7 Mon Sep 17 00:00:00 2001 From: acolytec3 <17355484+acolytec3@users.noreply.github.com> Date: Wed, 29 May 2024 16:31:15 -0400 Subject: [PATCH 5/7] remove dora --- .github/workflows/kurtosis-args.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/kurtosis-args.yaml b/.github/workflows/kurtosis-args.yaml index be039a3990..16e96effd4 100644 --- a/.github/workflows/kurtosis-args.yaml +++ b/.github/workflows/kurtosis-args.yaml @@ -8,7 +8,6 @@ participants: count: 1 additional_services: - assertoor - - dora assertoor_params: run_stability_check: false run_block_proposal_check: false From 9d88ffe9c795f592ccdd5b8f1f0209f9a9c86347 Mon Sep 17 00:00:00 2001 From: acolytec3 <17355484+acolytec3@users.noreply.github.com> Date: Wed, 29 May 2024 16:35:17 -0400 Subject: [PATCH 6/7] run kurtosis in docker build --- .github/workflows/client-build.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml index f9985cf7b7..e645808f7e 100644 --- a/.github/workflows/client-build.yml +++ b/.github/workflows/client-build.yml @@ -67,6 +67,10 @@ jobs: --platform linux/amd64 --build-arg COMMIT=$(git rev-parse HEAD) working-directory: ${{github.workspace}} + - name: Kurtosis Assertoor GitHub Action + uses: ethpandaops/kurtosis-assertoor-github-action@v1 + with: + ethereum_package_args: ${{github.workspace}}/.github/workflows/kurtosis-args.yaml test-client-cli: runs-on: ubuntu-latest @@ -85,12 +89,12 @@ jobs: - run: cd ${{github.workspace}}/packages/client && npx vitest run test/cli/cli - assertoor: - runs-on: ubuntu-latest - steps: - - name: Checkout Repository - uses: actions/checkout@v4 - - name: Kurtosis Assertoor GitHub Action - uses: ethpandaops/kurtosis-assertoor-github-action@v1 - with: - ethereum_package_args: ${{github.workspace}}/.github/workflows/kurtosis-args.yaml + # assertoor: + # runs-on: ubuntu-latest + # steps: + # - name: Checkout Repository + # uses: actions/checkout@v4 + # - name: Kurtosis Assertoor GitHub Action + # uses: ethpandaops/kurtosis-assertoor-github-action@v1 + # with: + # ethereum_package_args: ${{github.workspace}}/.github/workflows/kurtosis-args.yaml From baff0d8e32240454897c7da08966f10fecc23795 Mon Sep 17 00:00:00 2001 From: Amir Date: Mon, 1 Jul 2024 12:00:40 -0700 Subject: [PATCH 7/7] Use default image instead of local one --- .github/workflows/kurtosis-args.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/kurtosis-args.yaml b/.github/workflows/kurtosis-args.yaml index 16e96effd4..55ba4e9393 100644 --- a/.github/workflows/kurtosis-args.yaml +++ b/.github/workflows/kurtosis-args.yaml @@ -3,7 +3,7 @@ participants: cl_type: lighthouse count: 1 - el_type: ethereumjs - el_image: ethereumjs:local + # el_image: ethereumjs:local cl_type: lodestar count: 1 additional_services: