Skip to content

Commit 2bbc58f

Browse files
feat: add persistent runner support for merge queue zombienet tests (#9959)
# Description #9877 Co-authored-by: Javier Viola <[email protected]>
1 parent 8bdc024 commit 2bbc58f

File tree

2 files changed

+19
-4
lines changed

2 files changed

+19
-4
lines changed

.github/workflows/zombienet-reusable-preflight.yml

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,19 @@ jobs:
236236
cat .github/zombienet-env | grep -Ev '^\s*#|^\s*$'
237237
. .github/zombienet-env
238238
239+
# Determine if we should use persistent runners (for merge queues)
240+
RUNNER_SUFFIX=""
241+
if [[ $GITHUB_REF_NAME == *"gh-readonly-queue"* ]]; then
242+
RUNNER_SUFFIX="_PERSISTENT"
243+
fi
244+
245+
# Set zombienet v1 configuration
239246
if [[ "$ZOMBIENET_PROVIDER" == "native" ]]; then
240247
echo "ZOMBIENET_IMAGE=${ZOMBIENET_IMAGE_FOR_NATIVE}"
241-
echo "ZOMBIENET_DEFAULT_RUNNER=${ZOMBIENET_DEFAULT_RUNNER_FOR_NATIVE}"
242-
echo "ZOMBIENET_LARGE_RUNNER=${ZOMBIENET_LARGE_RUNNER_FOR_NATIVE}"
248+
DEFAULT_RUNNER_VAR="ZOMBIENET_DEFAULT_RUNNER_FOR_NATIVE${RUNNER_SUFFIX}"
249+
LARGE_RUNNER_VAR="ZOMBIENET_LARGE_RUNNER_FOR_NATIVE${RUNNER_SUFFIX}"
250+
echo "ZOMBIENET_DEFAULT_RUNNER=${!DEFAULT_RUNNER_VAR}"
251+
echo "ZOMBIENET_LARGE_RUNNER=${!LARGE_RUNNER_VAR}"
243252
else
244253
echo "ZOMBIENET_IMAGE=${ZOMBIENET_IMAGE_FOR_K8S}"
245254
# runner size for k8s is not relevant, it "only" spawns pods and runs the test
@@ -249,8 +258,10 @@ jobs:
249258
250259
if [[ "$ZOMBIE_PROVIDER" == "native" ]]; then
251260
echo "ZOMBIENET_SDK_IMAGE=${ZOMBIENET_SDK_IMAGE_FOR_NATIVE}"
252-
echo "ZOMBIENET_SDK_DEFAULT_RUNNER=${ZOMBIENET_SDK_DEFAULT_RUNNER_FOR_NATIVE}"
253-
echo "ZOMBIENET_SDK_LARGE_RUNNER=${ZOMBIENET_SDK_LARGE_RUNNER_FOR_NATIVE}"
261+
SDK_DEFAULT_RUNNER_VAR="ZOMBIENET_SDK_DEFAULT_RUNNER_FOR_NATIVE${RUNNER_SUFFIX}"
262+
SDK_LARGE_RUNNER_VAR="ZOMBIENET_SDK_LARGE_RUNNER_FOR_NATIVE${RUNNER_SUFFIX}"
263+
echo "ZOMBIENET_SDK_DEFAULT_RUNNER=${!SDK_DEFAULT_RUNNER_VAR}"
264+
echo "ZOMBIENET_SDK_LARGE_RUNNER=${!SDK_LARGE_RUNNER_VAR}"
254265
else
255266
echo "ZOMBIENET_SDK_IMAGE=${ZOMBIENET_SDK_IMAGE_FOR_K8S}"
256267
# runner size for k8s is not relevant, it "only" spawns pods and runs the test

.github/zombienet-env

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ ZOMBIENET_PROVIDER=native
33
ZOMBIENET_IMAGE_FOR_NATIVE=docker.io/paritytech/zombienet:v1.3.133
44
ZOMBIENET_DEFAULT_RUNNER_FOR_NATIVE=parity-zombienet-native-default
55
ZOMBIENET_LARGE_RUNNER_FOR_NATIVE=parity-zombienet-native-large
6+
ZOMBIENET_DEFAULT_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-default-persistent
7+
ZOMBIENET_LARGE_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-large-persistent
68
ZOMBIENET_IMAGE_FOR_K8S=docker.io/paritytech/zombienet:v1.3.133
79
ZOMBIENET_RUNNER_FOR_K8S=parity-zombienet
810
DEBUG=zombie,zombie::network-node,zombie::kube::client::logs
@@ -12,6 +14,8 @@ ZOMBIE_PROVIDER=native
1214
ZOMBIENET_SDK_IMAGE_FOR_NATIVE=docker.io/paritytech/ci-unified:bullseye-1.84.1-2025-01-28-v202502131220
1315
ZOMBIENET_SDK_DEFAULT_RUNNER_FOR_NATIVE=parity-zombienet-native-default
1416
ZOMBIENET_SDK_LARGE_RUNNER_FOR_NATIVE=parity-zombienet-native-large
17+
ZOMBIENET_SDK_DEFAULT_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-default-persistent
18+
ZOMBIENET_SDK_LARGE_RUNNER_FOR_NATIVE_PERSISTENT=parity-zombienet-native-large-persistent
1519
ZOMBIENET_SDK_IMAGE_FOR_K8S=docker.io/paritytech/zombienet:v1.3.133
1620
ZOMBIENET_SDK_RUNNER_FOR_K8S=parity-zombienet
1721
RUST_LOG=info,zombienet_orchestrator=trace,cumulus_zombienet_sdk_helpers=debug

0 commit comments

Comments
 (0)