Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: bump kurtosis tag and cdk-erigon #106

Merged
merged 11 commits into from
Oct 6, 2024
Merged

ci: bump kurtosis tag and cdk-erigon #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a670364
ci: bump kurtosis tag and cdk-erigon
vcastellm Oct 3, 2024
b05d65a
ci: new matrix
vcastellm Oct 3, 2024
771f691
ci: makefile
vcastellm Oct 3, 2024
98b5682
ci: remove fork11-validium
vcastellm Oct 3, 2024
9f17818
test: adapt to kurtosis port rename
vcastellm Oct 3, 2024
de19e54
fix: makefile
vcastellm Oct 3, 2024
4f8c2a5
Merge remote-tracking branch 'origin/develop' into override-erigon
vcastellm Oct 4, 2024
b2d3614
ci: erigon back
vcastellm Oct 4, 2024
1afc127
ci: try with prev
vcastellm Oct 5, 2024
fad744a
test: revert
vcastellm Oct 5, 2024
6ca3f10
ci: fork12 update
vcastellm Oct 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
goarch: [ "amd64" ]
e2e-group:
- "fork9-validium"
- "fork9-rollup"
- "fork11-rollup"
- "fork12-validium"
- "fork12-rollup"
runs-on: ubuntu-latest
Expand Down
6 changes: 3 additions & 3 deletions test/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 12 additions & 0 deletions test/combinations/fork11-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions test/combinations/fork12-cdk-validium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
1 change: 1 addition & 0 deletions test/combinations/fork12-rollup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
1 change: 1 addition & 0 deletions test/combinations/fork9-cdk-validium.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 0 additions & 12 deletions test/combinations/fork9-rollup.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion test/helpers/common-setup.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"}
}
}
Loading