Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Support new version of zombienet #4528

Merged
merged 8 commits into from
Dec 16, 2021
Merged

Support new version of zombienet #4528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
98ea1c0
test new version of zombienet
pepoviola Dec 15, 2021
a970faa
Merge branch 'master' into zombienet-version-upgrade-test
pepoviola Dec 15, 2021
bc5fa55
use default chain spec command
pepoviola Dec 15, 2021
7bfe616
use commit ref to get test files
pepoviola Dec 15, 2021
94261ca
change test spec for zombienet new versionzombienet_tests/parachains/…
pepoviola Dec 16, 2021
1ac311a
changes for new version of zombienet
pepoviola Dec 16, 2021
43290b0
Merge branch 'master' into zombienet-version-upgrade-test
pepoviola Dec 16, 2021
cc1da09
use paritytech zombienet version
pepoviola Dec 16, 2021
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
4 changes: 2 additions & 2 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ zombienet-tests-parachains-smoke-test:
- job: publish-adder-collator-image

variables:
GH_DIR: 'https://github.com/paritytech/polkadot/tree/master/zombienet_tests/parachains'
GH_DIR: 'https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/parachains'

before_script:
- echo "Zombie-net Tests Config"
Expand Down Expand Up @@ -658,7 +658,7 @@ zombienet-tests-malus-dispute-valid:
- job: publish-adder-collator-image

variables:
GH_DIR: 'https://github.com/paritytech/polkadot/tree/master/node/malus/integrationtests'
GH_DIR: 'https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/node/malus/integrationtests'

before_script:
- echo "Zombie-net Tests Config"
Expand Down
5 changes: 2 additions & 3 deletions node/malus/integrationtests/0001-dispute-valid-block.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ timeout = 1000
[relaychain]
default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
chain = "wococo-local"
chain_spec_command = "polkadot build-spec --chain wococo-local --disable-default-bootnode --raw > /cfg/wococo-local.json"
command = "polkadot"

[[relaychain.nodes]]
Expand All @@ -23,7 +22,7 @@ command = "polkadot"
extra_args = [ "--charlie", "-lparachain=debug" ]

[[relaychain.nodes]]
name = "david"
name = "dave"
validator = true
command = "/usr/local/bin/malus dispute-ancestor"
extra_args = ["--dave", "-lparachain=debug"]
Expand All @@ -37,4 +36,4 @@ id = 100
name = "collator01"
image = "{{COL_IMAGE}}"
command = "/usr/local/bin/adder-collator"
args = ["-lparachain=debug"]
args = ["-lparachain=debug"]
2 changes: 1 addition & 1 deletion zombienet_tests/parachains/0001-parachains-smoke-test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ timeout = 1000
[relaychain]
default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
chain = "rococo-local"
chain_spec_command = "polkadot build-spec --chain rococo-local --disable-default-bootnode --raw > /cfg/rococo-local.json"
command = "polkadot"

[[relaychain.nodes]]
Expand All @@ -17,6 +16,7 @@ command = "polkadot"

[[parachains]]
id = 100
addToGenesis = false

[parachains.collator]
name = "collator01"
Expand Down