feat: migrate e2e tests

.github/test_fork11_rollup_e2e_args.json

@@ -0,0 +1,13 @@
+{
+  "args": {
+    "zkevm_contracts_image": "leovct/zkevm-contracts:v7.0.0-rc.2-fork.11-patch.1",
+    "zkevm_prover_image": "hermeznetwork/zkevm-prover:v7.0.4-hotfix.2-fork.11",
+    "zkevm_node_image": "hermeznetwork/zkevm-node:v0.7.0-fork11",
+    "cdk_node_image": "cdk:local",
+    "gas_token_enabled": true,
+    "gas_token_address": "",
+    "data_availability_mode": "rollup",
+    "sequencer_type": "erigon",
+    "agglayer_image": "ghcr.io/agglayer/agglayer:0.2.0-rc.19"
+  }
+}

.github/test_fork12_cdk_validium_e2e_args.json

@@ -0,0 +1,11 @@
+{
+  "args": {
+    "zkevm_contracts_image": "jhkimqd/zkevm-contracts:v10.0.0-rc.6-fork.12",
+    "zkevm_prover_image": "hermeznetwork/zkevm-prover:v8.0.0-RC16-fork.12",
+    "cdk_node_image": "cdk:local",
+    "gas_token_enabled": true,
+    "gas_token_address": "",
+    "data_availability_mode": "cdk-validium",
+    "sequencer_type": "erigon"
+  }
+}

.github/test_fork12_rollup_e2e_args.json

@@ -0,0 +1,11 @@
+{
+  "args": {
+    "zkevm_contracts_image": "jhkimqd/zkevm-contracts:v10.0.0-rc.6-fork.12",
+    "zkevm_prover_image": "hermeznetwork/zkevm-prover:v8.0.0-RC16-fork.12",
+    "cdk_node_image": "cdk:local",
+    "gas_token_enabled": true,
+    "gas_token_address": "",
+    "data_availability_mode": "rollup",
+    "sequencer_type": "erigon"
+  }
+}

.github/test_fork9_cdk_validium_e2e_args.json

@@ -0,0 +1,17 @@
+{
+  "args": {
+    "zkevm_contracts_image": "leovct/zkevm-contracts:v6.0.0-rc.1-fork.9-patch.1",
+    "zkevm_prover_image": "hermeznetwork/zkevm-prover:v6.0.8",
+    "zkevm_node_image": "hermeznetwork/zkevm-node:v0.7.3",
+    "cdk_validium_node_image": "ghcr.io/0xpolygon/cdk-validium-node:0.6.4-cdk.10",
+    "cdk_node_image": "cdk:local",
+    "gas_token_enabled": true,
+    "gas_token_address": "",
+    "additional_services": [
+        "pless_zkevm_node"
+    ],
+    "data_availability_mode": "cdk-validium",
+    "sequencer_type": "erigon",
+    "agglayer_image": "ghcr.io/agglayer/agglayer:0.2.0-rc.19"
+  }
+}

.github/workflows/test-e2e.yml

@@ -6,6 +6,10 @@ on:
   workflow_dispatch: {}
 
 
+permissions:
+  id-token: write
+  contents: write
+
 jobs:
   build-cdk-image:
     runs-on: ubuntu-latest
@@ -30,79 +34,127 @@ jobs:
         name: cdk
         path: /tmp/cdk.tar
 
-  test-e2e:
+  read-test-args:
+    name: Read tests args
     runs-on: ubuntu-latest
-    timeout-minutes: 60
-    needs: build-cdk-image
-    strategy:
-      fail-fast: false
-      matrix:
-        e2e-group:
-          - "fork9-validium"
-          - "fork11-rollup"
-          - "fork12-validium"
-          - "fork12-rollup"
+    outputs:
+      test-fork9-cdk-validium-e2e-args: ${{ steps.read-args.outputs.test-fork9-cdk-validium-e2e-args }}
+      test-fork11-rollup-e2e-args: ${{ steps.read-args.outputs.test-fork11-rollup-e2e-args }}
+      test-fork12-cdk-validium-e2e-args: ${{ steps.read-args.outputs.test-fork12-cdk-validium-e2e-args }}
+      test-fork12-rollup-e2e-args: ${{ steps.read-args.outputs.test-fork12-rollup-e2e-args }}
     steps:
-    - name: Checkout Code
-      uses: actions/checkout@v4
-
-    - name: Checkout Kurtosis CDK
-      uses: actions/checkout@v4
-      with:
-        repository: 0xPolygon/kurtosis-cdk
-        path: kurtosis-cdk
-        ref: c3caebc409c7f69354ae012f15cac76f3edf8503
-
-    - name: Install Kurtosis CDK tools
-      uses: ./kurtosis-cdk/.github/actions/setup-kurtosis-cdk
-
-    - name: Install polycli
-      run: |
-        POLYCLI_VERSION="${{ vars.POLYCLI_VERSION }}"
-        tmp_dir=$(mktemp -d) 
-        curl -L "https://github.com/0xPolygon/polygon-cli/releases/download/${POLYCLI_VERSION}/polycli_${POLYCLI_VERSION}_linux_amd64.tar.gz" | tar -xz -C "$tmp_dir" 
-        mv "$tmp_dir"/* /usr/local/bin/polycli 
-        rm -rf "$tmp_dir"
-        sudo chmod +x /usr/local/bin/polycli
-        /usr/local/bin/polycli version
+      - name: Checkout
+        uses: actions/checkout@v4
 
-    - name: Setup Bats and bats libs
-      uses: bats-core/bats-action@2.0.0
-
-    - name: Download cdk archive
-      uses: actions/download-artifact@v4
-      with:
-        name: cdk
-        path: /tmp
-
-    - name: Load cdk image
-      run: |
-        docker load --input /tmp/cdk.tar
-        docker image ls -a
+      - name: Read kurtosis-cdk-args from file
+        id: read-args
+        run: |
+          CONTENT=$(cat ./.github/test_fork9_cdk_validium_e2e_args.json | jq -c .)
+          echo "test-fork9-cdk-validium-e2e-args=${CONTENT}" >> $GITHUB_OUTPUT
+          CONTENT=$(cat ./.github/test_fork11_rollup_e2e_args.json | jq -c .)
+          echo "test-fork11-rollup-e2e-args=${CONTENT}" >> $GITHUB_OUTPUT
+          CONTENT=$(cat ./.github/test_fork12_cdk_validium_e2e_args.json | jq -c .)
+          echo "test-fork12-cdk-validium-e2e-args=${CONTENT}" >> $GITHUB_OUTPUT
+          CONTENT=$(cat ./.github/test_fork12_rollup_e2e_args.json | jq -c .)
+          echo "test-fork12-rollup-e2e-args=${CONTENT}" >> $GITHUB_OUTPUT
 
-    - name: Run e2e tests
-      run: make test-e2e-${{ matrix.e2e-group }}
-      working-directory: test
-      env:
-        KURTOSIS_FOLDER: ${{ github.workspace }}/kurtosis-cdk
-        BATS_LIB_PATH: /usr/lib/
-        agglayer_prover_sp1_key: ${{ secrets.SP1_PRIVATE_KEY }}
-
-    - name: Dump enclave logs
-      if: failure()
-      run: kurtosis dump ./dump
+  test-fork9-cdk-validium-e2e:
+    name: E2E test
+    needs:
+      - build-cdk-image
+      - read-test-args
+    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@41dd4252fec7e16d6b6199652a182c47b40b02d6
+    secrets: inherit
+    with:
+      kurtosis-cdk-ref: 651696273abfaf19eae8233a3863f5e93091c087
+      agglayer-e2e-ref: 41dd4252fec7e16d6b6199652a182c47b40b02d6
+      test-name: test-fork9-cdk-validium-e2e
+      kurtosis-cdk-args: ${{ needs.read-test-args.outputs.test-fork9-cdk-validium-e2e-args }}
 
-    - name: Generate archive name
-      if: failure()
-      run: |
-        archive_name="dump_run_with_args_${{matrix.e2e-group}}_${{ github.run_id }}"
-        echo "ARCHIVE_NAME=${archive_name}" >> "$GITHUB_ENV"
-        echo "Generated archive name: ${archive_name}"
-        kurtosis service exec cdk cdk-node-001 'cat /etc/cdk/cdk-node-config.toml' > ./dump/cdk-node-config.toml
+  check-fork9-cdk-validium-e2e-result:
+    name: Check E2E results
+    permissions:
+      id-token: write
+      contents: write
+    needs:
+      - test-fork9-cdk-validium-e2e
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - run: exit 1
+        if: ${{ contains(fromJSON('["failure", "cancelled"]'), needs.test-fork9-cdk-validium-e2e.result) }}
 
-    - name: Upload logs
-      if: failure()
-      uses: actions/upload-artifact@v4
-      with:
-        name: ${{ env.ARCHIVE_NAME }}
-        path: ./dump
+  test-fork11-rollup-e2e:
+    name: E2E test
+    needs:
+      - build-cdk-image
+      - read-test-args
+    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@41dd4252fec7e16d6b6199652a182c47b40b02d6
+    secrets: inherit
+    with:
+      kurtosis-cdk-ref: 651696273abfaf19eae8233a3863f5e93091c087
+      agglayer-e2e-ref: 41dd4252fec7e16d6b6199652a182c47b40b02d6
+      test-name: test-fork11-rollup-e2e
+      kurtosis-cdk-args: ${{ needs.read-test-args.outputs.test-fork11-rollup-e2e-args }}
+
+  check-fork11-rollup-e2e-result:
+    name: Check E2E results
+    permissions:
+      id-token: write
+      contents: write
+    needs:
+      - test-fork11-rollup-e2e
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - run: exit 1
+        if: ${{ contains(fromJSON('["failure", "cancelled"]'), needs.test-fork11-rollup-e2e.result) }}
+
+  test-fork12-cdk-validium-e2e:
+    name: E2E test
+    needs:
+      - build-cdk-image
+      - read-test-args
+    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@41dd4252fec7e16d6b6199652a182c47b40b02d6
+    secrets: inherit
+    with:
+      kurtosis-cdk-ref: 651696273abfaf19eae8233a3863f5e93091c087
+      agglayer-e2e-ref: 41dd4252fec7e16d6b6199652a182c47b40b02d6
+      test-name: test-fork12-cdk-validium-e2e
+      kurtosis-cdk-args: ${{ needs.read-test-args.outputs.test-fork12-cdk-validium-e2e-args }}
+
+  check-fork12-cdk-validium-e2e-result:
+    name: Check E2E results
+    permissions:
+      id-token: write
+      contents: write
+    needs:
+      - test-fork12-cdk-validium-e2e
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - run: exit 1
+        if: ${{ contains(fromJSON('["failure", "cancelled"]'), needs.test-fork12-cdk-validium-e2e.result) }}
+
+  test-fork12-rollup-e2e:
+    name: E2E test
+    needs:
+      - build-cdk-image
+      - read-test-args
+    uses: agglayer/e2e/.github/workflows/cdk-e2e.yml@41dd4252fec7e16d6b6199652a182c47b40b02d6
+    secrets: inherit
+    with:
+      kurtosis-cdk-ref: 651696273abfaf19eae8233a3863f5e93091c087
+      agglayer-e2e-ref: 41dd4252fec7e16d6b6199652a182c47b40b02d6
+      test-name: test-fork12-rollup-e2e
+      kurtosis-cdk-args: ${{ needs.read-test-args.outputs.test-fork12-rollup-e2e-args }}
+
+  check-fork12-rollup-e2e-result:
+    name: Check E2E results
+    needs:
+      - test-fork12-rollup-e2e
+    if: always()
+    runs-on: ubuntu-latest
+    steps:
+      - run: exit 1
+        if: ${{ contains(fromJSON('["failure", "cancelled"]'), needs.test-fork12-rollup-e2e.result) }}

Makefile

@@ -68,7 +68,7 @@ build-go:
 
 .PHONY: build-docker
 build-docker: ## Builds a docker image with the cdk binary
-	docker build -t cdk -f ./Dockerfile .
+	docker build -t cdk:local -f ./Dockerfile .
 
 .PHONY: build-docker-nc
 build-docker-nc: ## Builds a docker image with the cdk binary - but without build cache