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

zombienet: try to fix parachains upgrade test #5724

Merged
merged 15 commits into from
Jun 28, 2022
Merged

zombienet: try to fix parachains upgrade test #5724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5510e88
zombienet: try to fix parachains upgrade test
Jun 23, 2022
c83b292
try a different collator image
Jun 23, 2022
72c9d92
Revert "try a different collator image"
Jun 23, 2022
0312fa0
try setting cumulusBased
Jun 23, 2022
16a8913
fix zombienet upgrade test
pepoviola Jun 23, 2022
43a4f4a
change image
pepoviola Jun 23, 2022
81707e3
update command for test
pepoviola Jun 23, 2022
8e168bd
update zombienet image
pepoviola Jun 23, 2022
eab9fa3
bump zombienet version
pepoviola Jun 24, 2022
c947a85
bump zn version
pepoviola Jun 25, 2022
ac5b732
Revert "try setting cumulusBased"
Jun 25, 2022
5923fe2
Revert "update command for test"
Jun 25, 2022
11545b6
Revert "change image"
Jun 25, 2022
06bebff
Merge branch 'master' into ao-fix-zombienet-parachain-upgrade
Jun 25, 2022
65f3bd9
zombienet: change validator image to a PR branch
Jun 27, 2022
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
6 changes: 3 additions & 3 deletions .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,9 +728,9 @@ zombienet-tests-parachains-disputes:

zombienet-test-parachains-upgrade-smoke-test:
stage: stage3
image: "${ZOMBIENET_IMAGE}"
<<: *kubernetes-env
<<: *zombienet-refs
image: "docker.io/paritytech/zombienet:v1.2.45"
Copy link
Author

@ordian ordian Jun 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we instead update the env variable ZOMBIENET_IMAGE?

Copy link
Contributor

@pepoviola pepoviola Jun 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that will update the image for all the tests. I can do that in a followup pr.
Thx!

needs:
- job: publish-polkadot-debug-image
- job: publish-malus-image
Expand All @@ -739,12 +739,12 @@ zombienet-test-parachains-upgrade-smoke-test:
GH_DIR: 'https://github.com/paritytech/polkadot/tree/${CI_COMMIT_SHORT_SHA}/zombienet_tests/smoke'
before_script:
- echo "ZombieNet Tests Config"
- echo "docker.io/parity/polkadot:latest"
- echo "${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}"
- echo "docker.io/parity/polkadot-collator:latest"
- echo "${ZOMBIENET_IMAGE}"
- echo "${GH_DIR}"
- export DEBUG=zombie,zombie::network-node
- export ZOMBIENET_INTEGRATION_TEST_IMAGE="docker.io/parity/polkadot:latest" # Use polkadot latest image
- export ZOMBIENET_INTEGRATION_TEST_IMAGE=${PARACHAINS_IMAGE_NAME}:${PARACHAINS_IMAGE_TAG}
- export COL_IMAGE="docker.io/parity/polkadot-collator:latest" # Use cumulus lastest image
script:
- /home/nonroot/zombie-net/scripts/ci/run-test-env-manager.sh
Expand Down
3 changes: 2 additions & 1 deletion zombienet_tests/smoke/0002-parachains-upgrade-smoke-test.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,12 @@ command = "polkadot"
[[parachains]]
id = 100
addToGenesis = true
cumulus_based = true

[parachains.collator]
name = "collator01"
image = "{{COL_IMAGE}}"
commandWithArgs = "polkadot-collator --collator --alice --force-authoring --tmp --parachain-id 100 --rpc-cors all --unsafe-rpc-external --rpc-methods unsafe --unsafe-ws-external -- --execution wasm --chain /cfg/rococo-local.json --bootnodes /dns/bootnode/tcp/30333/p2p/12D3KooWEyoppNCUx8Yx66oV9fJnriXwCcXwDDUA2kj6vnc6iDEp"
Copy link
Member

@eskimor eskimor Jun 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are those args no longer needed?

Copy link
Contributor

@sandreim sandreim Jun 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The parameters are added by zombienet automatically. We have the cumulus_based = true option which does that trick.

Copy link
Author

@ordian ordian Jun 28, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's handled by zombienet (some args inferred by cumulus_based):
https://github.com/paritytech/zombienet/blob/465622bc84f9824d8c712cc8aef74f4ee223ab0d/src/cmdGenerator.ts#L40

command = "polkadot-collator"

[[parachains.collator.env]]
name = "RUST_LOG"
Expand Down