Zombienet CI improvements

.github/actions/zombienet-sdk/action.yml

@@ -7,9 +7,12 @@ inputs:
   ref-slug:
     description: "Ref slug (e.g branch-name-short)"
     required: true
-  test:
+  test-filter:
     description: "test filter to pass to nextest (e.g: functional::spam_statement_distribution_requests::spam_statement_distribution_requests_test)"
     required: true
+  job-name:
+    description: "Job name to use for artifact uploading"
+    required: true
   prefix:
     description: "Archive prefix for tests files (e.g polkadot, cumulus or substrate)"
     required: true
@@ -25,7 +28,7 @@ runs:
     - name: common_vars
       shell: bash
       env:
-        TEST_NAME: ${{ inputs.test }}
+        TEST_FILTER: ${{ inputs.test-filter }}
         PREFIX: ${{ inputs.prefix }}
       run: |
         echo "Vars"
@@ -36,7 +39,7 @@ runs:
         echo "COL_IMAGE: $COL_IMAGE"
         echo "MALUS_IMAGE: $MALUS_IMAGE"
         echo "Inputs"
-        echo "test: $TEST_NAME"
+        echo "test: $TEST_FILTER"
         echo "prefix: $PREFIX"
 
     - name: Download binaries for zombienet native tests
@@ -66,7 +69,7 @@ runs:
       env:
         # don't retry sdk tests
         NEXTEST_RETRIES: 0
-        TEST_NAME: ${{ inputs.test }}
+        TEST_FILTER: ${{ inputs.test-filter }}
         PREFIX: ${{ inputs.prefix }}
       run: |
         # RUN_IN_CI=1 shall be set only for k8s provider
@@ -87,7 +90,7 @@ runs:
         # We want to run tests sequentially, '--no-capture' ensures that.
         # If we want to get rid of '--no-capture' some day, please use '--test-threads 1' or NEXTEST_TEST_THREADS=1
         # Both options cannot coexist for cargo-nextest below v0.9.94
-        cargo nextest run --archive-file ./artifacts/${PREFIX}-zombienet-tests.tar.zst --no-capture -- ${TEST_NAME}
+        cargo nextest run --archive-file ./artifacts/${PREFIX}-zombienet-tests.tar.zst --no-capture -- ${TEST_FILTER}
 
     - name: process_logs
       if: ${{ ! cancelled() }}
@@ -108,7 +111,7 @@ runs:
       uses: actions/upload-artifact@v4
       if: ${{ ! cancelled() }}
       with:
-        name: zombienet-logs-${{ github.job }}-${{ github.sha }}
+        name: zombienet-logs-${{ inputs.job-name }}-${{ github.sha }}
         path: |
           /tmp/zombie*/logs/*
 

.github/actions/zombienet/action.yml

@@ -1,9 +1,12 @@
 name: "Zombienet test v1"
 description: "Runs zombienet tests"
 inputs:
-  test:
+  test-definition:
     description: "test definition (zndsl file)"
     required: true
+  job-name:
+    description: "Job name to use for artifact uploading"
+    required: true
   local-dir:
     description: "Path to the directory tha contains the test file (.zndsl)"
     required: true
@@ -27,7 +30,7 @@ runs:
     - name: common_vars
       shell: bash
       env:
-        TEST_NAME: ${{ inputs.test }}
+        TEST_DEFINITION: ${{ inputs.test-definition }}
         LOCAL_PATH: ${{ inputs.local-dir }}
         CONCURRENCY: ${{ inputs.concurrency }}
       run: |
@@ -36,7 +39,8 @@ runs:
         echo "ZOMBIENET_PROVIDER: $ZOMBIENET_PROVIDER"
         echo "COL_IMAGE: $COL_IMAGE"
         echo "Inputs"
-        echo "test: $TEST_NAME"
+        echo "test-definition: $TEST_DEFINITION"
+        echo "job-name: ${{ inputs.job-name }}"
         echo "local-dir: $LOCAL_PATH"
         echo "concurrency: $CONCURRENCY"
 
@@ -59,7 +63,7 @@ runs:
     - name: zombie_test
       shell: bash
       env:
-        TEST_NAME: ${{ inputs.test }}
+        TEST_DEFINITION: ${{ inputs.test-definition }}
         LOCAL_PATH: ${{ inputs.local-dir }}
         CONCURRENCY: ${{ inputs.concurrency }}
       run: |
@@ -71,7 +75,7 @@ runs:
           ./.github/scripts/run-zombienet-test.sh \
             "$(pwd)/$LOCAL_PATH" \
             $CONCURRENCY \
-            "$TEST_NAME"
+            "$TEST_DEFINITION"
         else
           # no need to check other runner variables. for k8s they shall store the same value
           if [[ $ZOMBIENET_DEFAULT_RUNNER == "parity-zombienet" ]]; then
@@ -81,7 +85,7 @@ runs:
           /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
             --local-dir="$(pwd)/$LOCAL_PATH" \
             --concurrency=$CONCURRENCY \
-            --test="$TEST_NAME"
+            --test="$TEST_DEFINITION"
         fi
 
     - name: process_logs
@@ -102,7 +106,7 @@ runs:
       uses: actions/upload-artifact@v4
       if: ${{ ! cancelled() }}
       with:
-        name: zombienet-logs-${{ github.job }}-${{ github.sha }}
+        name: zombienet-logs-${{ inputs.job-name }}-${{ github.sha }}
         path: |
           /tmp/zombie*/logs/*
 

.github/scripts/dispatch-zombienet-workflow.sh

@@ -0,0 +1,105 @@
+#!/bin/bash
+
+# Exit on error
+# set -e
+
+function dbg {
+  local msg="$@"
+
+  local tstamp=$(date "+%Y-%m-%d %T")
+  printf "%s - %s\n" "$tstamp" "$msg"
+}
+
+function write_job_results_to_csv {
+  local run_id="$1"
+  local branch="$2"
+  local csv_file="$3"
+
+  dbg "Writing job results for run $run_id to $csv_file"
+
+  # Get job details for the completed run, filtering only jobs starting with 'zombienet-' and with success or failure conclusions
+  gh run view "$run_id" --json jobs --jq \
+    '.jobs[] | select(.name | startswith("zombienet-")) |
+      select(.conclusion == "success" or .conclusion == "failure") |
+      [.databaseId, .name, .conclusion, .startedAt, "'"$branch"'", .url] | @csv' >> "$csv_file"
+}
+
+# Parse command line arguments
+WORKFLOW_FILE=""
+BRANCH=""
+MAX_RESULT_CNT=-1
+TEST_PATTERN=""
+
+while getopts "w:b:m:p:h" opt; do
+  case $opt in
+    w) WORKFLOW_FILE="$OPTARG" ;;
+    b) BRANCH="$OPTARG" ;;
+    m) MAX_RESULT_CNT="$OPTARG" ;;
+    p) TEST_PATTERN="$OPTARG" ;;
+    h) echo "Usage: $0 -w <workflow-file> -b <branch> [-m max-triggers] [-p test-pattern]"
+       echo "  -w: Workflow file (required)"
+       echo "  -b: Branch name (required)"
+       echo "  -m: Maximum number of triggers (optional, default: infinite)"
+       echo "  -p: Test pattern for workflow input (optional)"
+       exit 0 ;;
+    \?) echo "Invalid option -$OPTARG" >&2
+        echo "Use -h for help"
+        exit 1 ;;
+  esac
+done
+
+if [[ -z "$WORKFLOW_FILE" || -z "$BRANCH" ]]; then
+  echo "Error: Both workflow file (-w) and branch (-b) are required"
+  echo "Usage: $0 -w <workflow-file> -b <branch> [-m max-triggers] [-p test-pattern]"
+  echo "Use -h for help"
+  exit 1
+fi
+
+# Create CSV file with headers
+CSV_FILE="workflow_results_$(date +%Y%m%d_%H%M%S).csv"
+echo "job_id,job_name,conclusion,started_at,branch,job_url" > "$CSV_FILE"
+dbg "Created CSV file: $CSV_FILE"
+
+dbg "Starting loop for workflow: $WORKFLOW_FILE on branch: $BRANCH"
+
+TRIGGER_CNT=0
+RESULT_CNT=0
+
+while [[ $MAX_RESULT_CNT -eq -1 || $RESULT_CNT -lt $MAX_RESULT_CNT ]]; do
+
+  dbg "Waiting until workflow $WORKFLOW_FILE (branch: $BRANCH) jobs are completed"
+
+  while true ; do
+    echo ""
+    gh run list  --workflow=$WORKFLOW_FILE -e workflow_dispatch -b $BRANCH -L 5
+    sleep 2
+    # if job is completed it should have non-empty conclusion field
+    ALL_JOBS_COMPLETED=$(gh run list --workflow=$WORKFLOW_FILE -e workflow_dispatch -b $BRANCH --json conclusion --jq 'all(.[]; .conclusion != "")')
+    if [[ "$ALL_JOBS_COMPLETED" == "true" ]]; then
+      break
+    fi
+    sleep 60
+  done
+  dbg "Workflow $WORKFLOW_FILE (branch: $BRANCH) jobs completed"
+
+  # Skip the first iteration - latest run id is not the one we triggered here
+  if [ $TRIGGER_CNT -gt 0 ]; then
+    # Get the most recent completed run ID and write job results to CSV
+    LATEST_RUN_ID=$(gh run list --workflow=$WORKFLOW_FILE -e workflow_dispatch -b $BRANCH -L 1 --json databaseId --jq '.[0].databaseId')
+    write_job_results_to_csv "$LATEST_RUN_ID" "$BRANCH" "$CSV_FILE"
+    RESULT_CNT=$(( RESULT_CNT + 1 ))
+  fi
+
+  TRIGGER_CNT=$(( TRIGGER_CNT + 1 ))
+  dbg "Triggering #$TRIGGER_CNT workflow $WORKFLOW_FILE (branch: $BRANCH)"
+
+  if [[ -n "$TEST_PATTERN" ]]; then
+    gh workflow run "$WORKFLOW_FILE" --ref "$BRANCH" -f test_pattern="$TEST_PATTERN"
+  else
+    gh workflow run "$WORKFLOW_FILE" --ref "$BRANCH"
+  fi
+
+  dbg "Sleeping 60s"
+  sleep 60
+done
+

.github/scripts/parse-zombienet-tests.py

@@ -0,0 +1,42 @@
+#!/usr/bin/env python3
+
+import argparse
+import yaml
+import json
+import fnmatch
+
+def parse_args():
+    parser = argparse.ArgumentParser(description="Parse test matrix YAML file with optional filtering")
+    parser.add_argument("--matrix", required=True, help="Path to the YAML matrix file")
+    parser.add_argument("--flaky-tests", default="", help="Newline-separated list of flaky job names")
+    parser.add_argument("--test-pattern", default="", help="Pattern to match job_name (substring or glob)")
+    return parser.parse_args()
+
+def load_jobs(matrix_path):
+    with open(matrix_path, "r") as f:
+        return yaml.safe_load(f)
+
+def filter_jobs(jobs, flaky_tests, test_pattern):
+    flaky_set = set(name.strip() for name in flaky_tests.splitlines() if name.strip())
+    filtered = []
+
+    for job in jobs:
+        name = job.get("job-name", "")
+
+        # If test_pattern provided then don't care about flaky tests, just check test_pattern
+        if test_pattern and len(test_pattern) > 0:
+            if fnmatch.fnmatch(name, f"*{test_pattern}*"):
+                filtered.append(job)
+        elif name not in flaky_set:
+            filtered.append(job)
+
+    return filtered
+
+def main():
+    args = parse_args()
+    jobs = load_jobs(args.matrix)
+    result = filter_jobs(jobs, args.flaky_tests, args.test_pattern)
+    print(json.dumps(result))
+
+if __name__ == "__main__":
+    main()

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

@@ -16,6 +16,13 @@ name: Zombienet Preflight
 
 on:
   workflow_call:
+    inputs:
+      tests_yaml:
+        required: true
+        type: string
+      test_pattern:
+        required: false
+        type: string
     # Map the workflow outputs to job outputs
     outputs:
       changes_substrate:
@@ -133,6 +140,10 @@ on:
         description: |
           comma separated list of flaky tests to skip.
 
+      TEST_MATRIX:
+        value: ${{ jobs.preflight.outputs.TEST_MATRIX }}
+        description: |
+          JSON formatted test matrix parsed from test yaml
 jobs:
   #
   #
@@ -166,6 +177,7 @@ jobs:
       KUBERNETES_MEMORY_REQUEST: ${{ steps.set_vars.outputs.KUBERNETES_MEMORY_REQUEST }}
       TEMP_IMAGES_BASE: ${{ steps.set_vars.outputs.TEMP_IMAGES_BASE }}
       FLAKY_TESTS: ${{ steps.set_vars.outputs.FLAKY_TESTS }}
+      TEST_MATRIX: ${{ steps.generate_test_matrix.outputs.TEST_MATRIX }}
 
       # zombienet-sdk vars
       RUST_LOG: ${{ steps.set_vars.outputs.RUST_LOG }}
@@ -282,6 +294,17 @@ jobs:
           echo "ZOMBIENET_IMAGE: ${{ steps.set_vars.outputs.ZOMBIENET_IMAGE }}"
           echo "ZOMBIENET_SDK_IMAGE: ${{ steps.set_vars.outputs.ZOMBIENET_SDK_IMAGE }}"
 
+      - name: Generate test matrix
+        id: generate_test_matrix
+        shell: bash
+        run: |
+          python3 .github/scripts/parse-zombienet-tests.py \
+            --matrix  ${{ inputs.tests_yaml }} \
+            --flaky-tests "${{ steps.set_vars.outputs.FLAKY_TESTS }}" \
+            --test-pattern "${{ inputs.test_pattern || '' }}" > matrix.json
+          echo "TEST_MATRIX=$(cat matrix.json)" >> $GITHUB_OUTPUT
+          echo "TEST_MATRIX:"
+          cat matrix.json | jq '.'
   #
   #
   #