From 3e357ec0a86d677392cb53c91c8ae2bb4ef6e840 Mon Sep 17 00:00:00 2001 From: Andrei Sandu <54316454+sandreim@users.noreply.github.com> Date: Mon, 14 Mar 2022 12:47:37 +0200 Subject: [PATCH] Zombienet: add cpu/mem resource requests (#5080) * Ensure request/limits for CPU and memory for nodes Signed-off-by: Andrei Sandu * docker.io/paritytech/zombienet:v1.2.19 Signed-off-by: Andrei Sandu * Deny failure Signed-off-by: Andrei Sandu * add retry back Signed-off-by: Andrei Sandu --- polkadot/.gitlab-ci.yml | 6 +++--- .../zombienet_tests/functional/0001-parachains-pvf.toml | 4 ++++ .../functional/0002-parachains-disputes.toml | 6 +++++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/polkadot/.gitlab-ci.yml b/polkadot/.gitlab-ci.yml index 6078874a04..66bd12584c 100644 --- a/polkadot/.gitlab-ci.yml +++ b/polkadot/.gitlab-ci.yml @@ -32,7 +32,7 @@ variables: CI_IMAGE: "paritytech/ci-linux:production" DOCKER_OS: "debian:stretch" ARCH: "x86_64" - ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.14" + ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.2.19" VAULT_SERVER_URL: "https://vault.parity-mgmt-vault.parity.io" VAULT_AUTH_PATH: "gitlab-parity-io-jwt" VAULT_AUTH_ROLE: "cicd_gitlab_parity_${CI_PROJECT_NAME}" @@ -688,7 +688,7 @@ zombienet-tests-parachains-pvf: - /home/nonroot/zombie-net/scripts/run-test-env-manager.sh --github-remote-dir="${GH_DIR}" --test="0001-parachains-pvf.feature" - allow_failure: true + allow_failure: false retry: 2 tags: - zombienet-polkadot-integration-test @@ -718,7 +718,7 @@ zombienet-tests-parachains-disputes: - /home/nonroot/zombie-net/scripts/run-test-env-manager.sh --github-remote-dir="${GH_DIR}" --test="0002-parachains-disputes.feature" - allow_failure: true + allow_failure: false retry: 2 tags: - zombienet-polkadot-integration-test diff --git a/polkadot/zombienet_tests/functional/0001-parachains-pvf.toml b/polkadot/zombienet_tests/functional/0001-parachains-pvf.toml index bafbb4c679..631d92f882 100644 --- a/polkadot/zombienet_tests/functional/0001-parachains-pvf.toml +++ b/polkadot/zombienet_tests/functional/0001-parachains-pvf.toml @@ -6,6 +6,10 @@ default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}" chain = "rococo-local" chain_spec_command = "polkadot build-spec --chain rococo-local --disable-default-bootnode" +[relaychain.default_resources] +limits = { memory = "4G", cpu = "2" } +requests = { memory = "2G", cpu = "1" } + [[relaychain.nodes]] name = "alice" extra_args = [ "--alice", "-lparachain=debug,runtime=debug" ] diff --git a/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml b/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml index f3d4bfe1db..8e35ee01f6 100644 --- a/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml +++ b/polkadot/zombienet_tests/functional/0002-parachains-disputes.toml @@ -10,7 +10,11 @@ default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}" chain = "rococo-local" chain_spec_command = "polkadot build-spec --chain rococo-local --disable-default-bootnode" default_command = "polkadot" - + +[relaychain.default_resources] +limits = { memory = "4G", cpu = "2" } +requests = { memory = "2G", cpu = "1" } + [[relaychain.nodes]] image = "{{MALUS_IMAGE}}" name = "alice"