From a47943983f18ce00ceab3052bf2f9a2c62f80327 Mon Sep 17 00:00:00 2001
From: ordian <write@reusable.software>
Date: Wed, 6 Sep 2023 20:39:42 +0200
Subject: [PATCH] zombienet: use another collator image for the slashing test
(#1386)
* zombienet: use test-parachain image for the slashing test
* use the right image
* try polkadot-parachain image
* try naming collator alice :see_no_evil:
* add needed job for the pipeline
* fix user id in polkadot-parachain-debug image
* small tweaks to the test
* another small tweak
* yet another small tweak
* bump zombienet version
---------
Co-authored-by: Javier Viola <javier@parity.io>
---
.gitlab-ci.yml | 2 +-
.gitlab/pipeline/zombienet/polkadot.yml | 4 ++++
.../polkadot-parachain-debug_unsigned_injected.Dockerfile | 2 +-
.../functional/0005-parachains-disputes-past-session.toml | 7 +++----
.../functional/0005-parachains-disputes-past-session.zndsl | 6 +++---
5 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2e0465ba1eb..748db808de6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ variables:
RUSTY_CACHIER_COMPRESSION_METHOD: zstd
NEXTEST_FAILURE_OUTPUT: immediate-final
NEXTEST_SUCCESS_OUTPUT: final
- ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.65"
+ ZOMBIENET_IMAGE: "docker.io/paritytech/zombienet:v1.3.67"
DOCKER_IMAGES_VERSION: "${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHORT_SHA}"
default:
diff --git a/.gitlab/pipeline/zombienet/polkadot.yml b/.gitlab/pipeline/zombienet/polkadot.yml
index 87b821742c6..349807a610d 100644
--- a/.gitlab/pipeline/zombienet/polkadot.yml
+++ b/.gitlab/pipeline/zombienet/polkadot.yml
@@ -9,6 +9,7 @@
- export ZOMBIENET_INTEGRATION_TEST_IMAGE="${POLKADOT_IMAGE}":${PIPELINE_IMAGE_TAG}
- export ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE="docker.io/parity/polkadot:${BUILD_RELEASE_VERSION}"
- export COL_IMAGE="${COLANDER_IMAGE}":${PIPELINE_IMAGE_TAG}
+ - export CUMULUS_IMAGE="docker.io/paritypr/polkadot-parachain-debug:${DOCKER_IMAGES_VERSION}"
- export MALUS_IMAGE="${MALUS_IMAGE}":${PIPELINE_IMAGE_TAG}
- echo "Zombienet Tests Config"
- echo "gh-dir ${GH_DIR}"
@@ -16,6 +17,7 @@
- echo "polkadot image ${ZOMBIENET_INTEGRATION_TEST_IMAGE}"
- echo "polkadot secondary image ${ZOMBIENET_INTEGRATION_TEST_SECONDARY_IMAGE}"
- echo "colander image ${COL_IMAGE}"
+ - echo "cumulus image ${CUMULUS_IMAGE}"
- echo "malus image ${MALUS_IMAGE}"
stage: zombienet
image: "${ZOMBIENET_IMAGE}"
@@ -28,6 +30,8 @@
artifacts: true
- job: build-push-image-colander
artifacts: true
+ - job: build-push-image-polkadot-parachain-debug
+ artifacts: true
extends:
- .kubernetes-env
- .zombienet-refs
diff --git a/docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile b/docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile
index 7a2202d9c52..75cc2b9e629 100644
--- a/docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile
+++ b/docker/dockerfiles/polkadot-parachain/polkadot-parachain-debug_unsigned_injected.Dockerfile
@@ -28,7 +28,7 @@ RUN apt-get update && \
apt-get clean && \
find /var/lib/apt/lists/ -type f -not -name lock -delete; \
# add user and link ~/.local/share/polkadot-parachain to /data
- useradd -m -u 10000 -U -s /bin/sh -d /polkadot-parachain polkadot-parachain && \
+ useradd -m -u 1000 -U -s /bin/sh -d /polkadot-parachain polkadot-parachain && \
mkdir -p /data /polkadot-parachain/.local/share && \
chown -R polkadot-parachain:polkadot-parachain /data && \
ln -s /data /polkadot-parachain/.local/share/polkadot-parachain && \
diff --git a/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml b/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml
index 50c465950f7..25d922bb682 100644
--- a/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml
+++ b/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.toml
@@ -5,7 +5,7 @@ bootnode = true
[relaychain.genesis.runtime.configuration.config]
max_validators_per_core = 1
needed_approvals = 2
- group_rotation_frequency = 3
+ group_rotation_frequency = 2
[relaychain]
default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
@@ -39,8 +39,7 @@ id = 1000
cumulus_based = true
[parachains.collator]
- name = "collator"
+ name = "alice"
command = "polkadot-parachain"
- image = "docker.io/parity/polkadot-parachain:latest"
- # image = "{{COL_IMAGE}}"
+ image = "{{CUMULUS_IMAGE}}"
args = ["-lparachain=debug"]
diff --git a/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.zndsl b/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.zndsl
index bc3674f4f53..a3f1f0669ac 100644
--- a/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.zndsl
+++ b/polkadot/zombienet_tests/functional/0005-parachains-disputes-past-session.zndsl
@@ -21,18 +21,18 @@ malus-validator: resume
malus-validator: log line matches "Suggesting malicious candidate" within 200 seconds
# Pause first flaky node
-# Availability and finality will continue with 3/4 nodes online (incl. malus)
+# Availability will continue with 3/4 nodes online (incl. malus)
honest-flaky-validator-0: pause
# Wait for the dispute
-honest-flaky-validator-1: reports parachain_candidate_disputes_total is at least 1 within 40 seconds
+honest-flaky-validator-1: reports parachain_candidate_disputes_total is at least 1 within 60 seconds
# Pause second flaky node so that we do not revert blocks due to f+1 invalid votes
# Availability and finality will stop
honest-flaky-validator-1: pause
# Wait for 1 full session to pass after the last unconcluded dispute.
-sleep 120 seconds
+sleep 110 seconds
# Now resume flaky validators
honest-flaky-validator: resume
--
GitLab