ci: bump kurtosis tag and cdk-erigon (#106)

* ci: bump cdk-erigon Also remove testing fork9-rollup
0xPolygon · Oct 6, 2024 · 909726e · 909726e
1 parent 9414f24
commit 909726e
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 17 deletions.
diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -15,7 +15,7 @@ jobs:
         goarch: [ "amd64" ]
         e2e-group:
           - "fork9-validium"
-          - "fork9-rollup"
+          - "fork11-rollup"
           - "fork12-validium"
           - "fork12-rollup"
     runs-on: ubuntu-latest

diff --git a/test/Makefile b/test/Makefile
@@ -54,9 +54,9 @@ test-e2e-fork9-validium: stop
 	./run-e2e.sh fork9 cdk-validium
 	bats .
 
-.PHONY: test-e2e-fork9-rollup
-test-e2e-fork9-rollup: stop
-	./run-e2e.sh fork9 rollup
+.PHONY: test-e2e-fork11-rollup
+test-e2e-fork11-rollup: stop
+	./run-e2e.sh fork11 rollup
 	bats .
 
 .PHONY: test-e2e-fork12-validium

diff --git a/test/combinations/fork11-rollup.yml b/test/combinations/fork11-rollup.yml
@@ -0,0 +1,12 @@
+args:
+  zkevm_contracts_image: leovct/zkevm-contracts:v7.0.0-rc.2-fork.11
+  zkevm_prover_image: hermeznetwork/zkevm-prover:v7.0.0-RC31-fork.11
+  zkevm_node_image: hermeznetwork/zkevm-node:v0.7.0-fork11-RC1
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
+  cdk_node_image: cdk
+  zkevm_use_gas_token_contract: true
+  additional_services:
+    - pless_zkevm_node
+    - tx_spammer
+  data_availability_mode: rollup
+  sequencer_type: erigon
diff --git a/test/combinations/fork12-cdk-validium.yml b/test/combinations/fork12-cdk-validium.yml
@@ -1,6 +1,7 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.3-fork.12
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC10-fork.12
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
   cdk_node_image: cdk
   zkevm_use_gas_token_contract: true
   additional_services:

diff --git a/test/combinations/fork12-rollup.yml b/test/combinations/fork12-rollup.yml
@@ -1,6 +1,7 @@
 args:
   zkevm_contracts_image: leovct/zkevm-contracts:v8.0.0-rc.3-fork.12
   zkevm_prover_image: hermeznetwork/zkevm-prover:v8.0.0-RC10-fork.12
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
   cdk_node_image: cdk
   zkevm_use_gas_token_contract: true
   additional_services:

diff --git a/test/combinations/fork9-cdk-validium.yml b/test/combinations/fork9-cdk-validium.yml
@@ -3,6 +3,7 @@ args:
   zkevm_prover_image: hermeznetwork/zkevm-prover:v6.0.4
   zkevm_node_image: hermeznetwork/zkevm-node:v0.7.3-RC1
   cdk_validium_node_image: 0xpolygon/cdk-validium-node:0.7.0-cdk
+  cdk_erigon_node_image: hermeznetwork/cdk-erigon:0948e33
   cdk_node_image: cdk
   zkevm_use_gas_token_contract: true
   additional_services:

diff --git a/test/combinations/fork9-rollup.yml b/test/combinations/fork9-rollup.yml
diff --git a/test/helpers/common-setup.bash b/test/helpers/common-setup.bash
@@ -23,4 +23,4 @@ _common_setup() {
     readonly contracts_service_wrapper=${KURTOSIS_CONTRACTS_WRAPPER:-"kurtosis service exec $enclave $contracts_container"}
     readonly erigon_rpc_node=${KURTOSIS_ERIGON_RPC:-cdk-erigon-node-001}
     readonly l2_rpc_url=${L2_ETH_RPC_URL:-"$(kurtosis port print $enclave $erigon_rpc_node http-rpc)"}
-}
+}