Zombienet CI improvements (#12372)

- Fix loki url
- Add debug for sending logs to loki
- Add retries for additional setup.

Author: pepoviola

.github/scripts/process-logs-zombienet.sh

@@ -4,9 +4,10 @@ set -euo pipefail
 # This script processes logs produced by nodes spawned using the zombienet-sdk framework.
 # The logs are prepared for upload as GitHub artifacts.
 # If Loki logging is available, the corresponding log URLs are also printed.
-# NOTE: P2838773B5F7DE937 is the loki.cicd until we switch to loki.zombienet
-LOKI_URL_FOR_NODE='https://grafana.teleport.parity.io/explore?orgId=1&left=%7B%22datasource%22:%22P2838773B5F7DE937%22,%22queries%22:%5B%7B%22refId%22:%22A%22,%22datasource%22:%7B%22type%22:%22loki%22,%22uid%22:%22P2838773B5F7DE937%22%7D,%22editorMode%22:%22code%22,%22expr%22:%22%7Bzombie_ns%3D%5C%22{{namespace}}%5C%22,zombie_node%3D%5C%22{{podName}}%5C%22%7D%22,%22queryType%22:%22range%22%7D%5D,%22range%22:%7B%22from%22:%22{{from}}%22,%22to%22:%22{{to}}%22%7D%7D'
+# NOTE: P982945308D3682D1 is the loki until we switch to loki.zombienet
+LOKI_URL_FOR_NODE='https://grafana.teleport.parity.io/explore?schemaVersion=1&panes=%7B%22vxs%22:%7B%22datasource%22:%22P982945308D3682D1%22,%22queries%22:%5B%7B%22refId%22:%22A%22,%22expr%22:%22%7Bzombie_ns%3D%5C%22{{namespace}}%5C%22,zombie_node%3D%5C%22{{podName}}%5C%22%7D%22,%22queryType%22:%22range%22,%22datasource%22:%7B%22type%22:%22loki%22,%22uid%22:%22P982945308D3682D1%22%7D,%22editorMode%22:%22code%22,%22direction%22:%22forward%22%7D%5D,%22range%22:%7B%22from%22:%22{{from}}%22,%22to%22:%22{{to}}%22%7D,%22compact%22:false%7D%7D&orgId=1'
 
+# Directory to send logs to loki
 LOKI_DIR_FOR_NATIVE_LOGS="/var/log/shared/zombienet"
 
 # JQ queries
@@ -89,6 +90,7 @@ process_logs_from_fallback() {
     # Send logs to loki
     if [[ -d "$LOKI_DIR_FOR_NATIVE_LOGS" ]]; then
       if [[ -f "$TARGET_DIR/$name.log" ]]; then
+        echo -e "sending logs to loki file: $LOKI_DIR_FOR_NATIVE_LOGS/to-loki.log"
         awk -v NS="$NS" -v NAME="$name" '{print NS" "NAME" " $0}' "$TARGET_DIR/$name.log" >> "$LOKI_DIR_FOR_NATIVE_LOGS/to-loki.log"
         local_to=$(($(date +%s%3N) + 60000))
       fi
@@ -172,6 +174,7 @@ process_logs_from_zombie_file() {
 
         # send logs to loki
         if [[ -d "$LOKI_DIR_FOR_NATIVE_LOGS" && -f "$TARGET_DIR/$name.log" ]]; then
+          echo -e "[para] sending logs to loki file: $LOKI_DIR_FOR_NATIVE_LOGS/to-loki.log"
           awk -v NS="$NS" -v NAME="$name" '{print NS" "NAME" " $0}' "$TARGET_DIR/$name.log" >> "$LOKI_DIR_FOR_NATIVE_LOGS/to-loki.log"
           local_to=$(($(date +%s%3N) + 60000))
         fi

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

@@ -347,7 +347,7 @@ jobs:
           cat .github/zombienet-flaky-tests
 
       #
-      #
+      # Set docker images
       #
       - name: Set docker images version
         id: set_images_version

.github/zombienet-tests/zombienet_polkadot_tests.yml

@@ -43,13 +43,13 @@
     for bin in polkadot polkadot-parachain; do
       OLD_NAME="$bin-old"
       echo "downloading $bin as $OLD_NAME in $BIN_DIR";
-      curl -L -o $BIN_DIR/$OLD_NAME https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.7.0/$bin
+      curl --retry 5 --retry-delay 10 --retry-max-time 120 -L -o $BIN_DIR/$OLD_NAME https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.7.0/$bin
       chmod 755 $BIN_DIR/$OLD_NAME;
     done
     for bin in polkadot-execute-worker polkadot-prepare-worker; do
       OLD_NAME="$bin"
       echo "downloading $bin as $OLD_NAME in $BIN_DIR";
-      curl -L -o $BIN_DIR/$OLD_NAME https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.7.0/$bin
+      curl --retry 5 --retry-delay 10 --retry-max-time 120 -L -o $BIN_DIR/$OLD_NAME https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-v1.7.0/$bin
       chmod 755 $BIN_DIR/$OLD_NAME;
     done
     ls -ltr $BIN_DIR
@@ -178,13 +178,13 @@
     for bin in polkadot polkadot-parachain; do
       OLD_NAME="$bin-old"
       echo "downloading $bin as $OLD_NAME in $BIN_DIR";
-      curl -L -o $BIN_DIR/$OLD_NAME https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-stable2503/$bin
+      curl --retry 5 --retry-delay 10 --retry-max-time 120 -L -o $BIN_DIR/$OLD_NAME https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-stable2503/$bin
       chmod 755 $BIN_DIR/$OLD_NAME;
     done
     for bin in polkadot-execute-worker polkadot-prepare-worker; do
       OLD_NAME="$bin"
       echo "downloading $bin as $OLD_NAME in $BIN_DIR";
-      curl -L -o $BIN_DIR/$OLD_NAME https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-stable2503/$bin
+      curl --retry 5 --retry-delay 10 --retry-max-time 120 -L -o $BIN_DIR/$OLD_NAME https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-stable2503/$bin
       chmod 755 $BIN_DIR/$OLD_NAME;
     done
     ls -ltr $BIN_DIR
@@ -245,11 +245,11 @@
     BIN_DIR="$(pwd)/bin_old"
     mkdir -p $BIN_DIR
     echo "downloading polkadot as polkadot-old in $BIN_DIR"
-    curl -L -o $BIN_DIR/polkadot-old https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-stable2512/polkadot
+    curl --retry 5 --retry-delay 10 --retry-max-time 120 -L -o $BIN_DIR/polkadot-old https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-stable2512/polkadot
     chmod 755 $BIN_DIR/polkadot-old
     for bin in polkadot-execute-worker polkadot-prepare-worker; do
       echo "downloading $bin in $BIN_DIR"
-      curl -L -o $BIN_DIR/$bin https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-stable2512/$bin
+      curl --retry 5 --retry-delay 10 --retry-max-time 120 -L -o $BIN_DIR/$bin https://github.com/paritytech/polkadot-sdk/releases/download/polkadot-stable2512/$bin
       chmod 755 $BIN_DIR/$bin
     done
     ls -ltr $BIN_DIR

polkadot/zombienet-sdk-tests/tests/functional/approved_peer_mixed_validators.rs

@@ -113,7 +113,7 @@ async fn approved_peer_mixed_validators_test() -> Result<(), anyhow::Error> {
 	assert_para_throughput(
 		&relay_client,
 		15,
-		[(ParaId::from(2000), 6..15), (ParaId::from(2001), 11..16)],
+		[(ParaId::from(2000), 6..16), (ParaId::from(2001), 11..16)],
 		[],
 	)
 	.await?;