Make zombienet CI great again

.github/actions/download-artifact-extract/action.yml

@@ -0,0 +1,78 @@
+name: "Download and extract artifact"
+description: "Downloads an artifact, extracts it, and optionally copies files to a destination"
+
+inputs:
+  artifact-name:
+    description: "Name of the artifact to download"
+    required: true
+  gh-token:
+    description: "GITHUB_TOKEN to use for downloading artifacts"
+    required: true
+  run-id:
+    description: "Run ID from which to download the artifact"
+    required: true
+  extract-path:
+    description: "Path where to extract the artifact"
+    default: "."
+    required: false
+  files-to-copy:
+    description: "Comma-separated (or newline-separated, remember about |) list of files to copy from the extracted artifact"
+    required: false
+  destination-path:
+    description: "Destination path for copied files"
+    required: false
+  cleanup:
+    description: "Whether to remove downloaded artifacts after copying (true/false)"
+    required: false
+    default: "false"
+
+runs:
+  using: "composite"
+  steps:
+    - uses: actions/[email protected]
+      with:
+        name: ${{ inputs.artifact-name }}
+        github-token: ${{ inputs.gh-token }}
+        run-id: ${{ inputs.run-id }}
+        path: ${{ inputs.extract-path }}
+
+    - name: Extract artifact
+      shell: bash
+      working-directory: ${{ inputs.extract-path }}
+      run: |
+        if [[ -f artifacts.tar ]]; then
+          tar -xvf artifacts.tar
+        elif [[ -f *.tar ]]; then
+          tar -xvf *.tar
+        elif [[ -f *.tar.gz ]]; then
+          tar -xzvf *.tar.gz
+        elif [[ -f *.tgz ]]; then
+          tar -xzvf *.tgz
+        elif [[ -f *.zip ]]; then
+          unzip *.zip
+        else
+          echo "No archive file found to extract"
+          ls -la
+        fi
+
+    - name: Copy files if specified
+      if: inputs.files-to-copy != ''
+      shell: bash
+      run: |
+        # Create destination directory
+        mkdir -p "${{ inputs.destination-path }}"
+
+        echo "${{ inputs.files-to-copy }}" | tr ',' '\n' | while read -r file; do
+          # trim leading and trailing whitespaces
+          file="$(echo "$file" | xargs)"
+          if [[ -n "$file" ]]; then
+            echo "Copying $file to ${{ inputs.destination-path }}"
+            cp -r "${{ inputs.extract-path }}/$file" "${{ inputs.destination-path }}/"
+          fi
+        done
+
+        # Cleanup if requested
+        if [[ "${{ inputs.cleanup }}" == "true" ]]; then
+          echo "Cleaning up downloaded artifacts in ${{ inputs.extract-path }}"
+          rm -rf "${{ inputs.extract-path }}"
+        fi

.github/actions/download-binaries-for-zombienet-tests/action.yml

@@ -0,0 +1,104 @@
+name: "Download binaries for zombienet tests"
+description: "Zombienet native tests expects some set of binaries to be available in the filesystem"
+
+inputs:
+  build-id:
+    description: ""
+    required: true
+  ref-slug:
+    description: "Ref slug (e.g branch-name-short)"
+    required: true
+  gh-token:
+    description: "GITHUB_TOKEN to use for downloading artifacts"
+    required: true
+  destination-path:
+    description: "Destination path for copied files"
+    required: false
+
+runs:
+  using: "composite"
+  steps:
+    - uses: ./.github/actions/download-artifact-extract
+      with:
+        artifact-name: build-linux-substrate-${{ inputs.ref-slug }}
+        gh-token: ${{ inputs.gh-token }}
+        run-id: ${{ inputs.build-id }}
+        extract-path: ./tmp
+        files-to-copy: |
+          artifacts/substrate/substrate
+        destination-path: ${{ inputs.destination-path }}
+        cleanup: "true"
+
+    - uses: ./.github/actions/download-artifact-extract
+      with:
+        artifact-name: build-linux-stable-${{ inputs.ref-slug }}
+        gh-token: ${{ inputs.gh-token }}
+        run-id: ${{ inputs.build-id }}
+        extract-path: ./tmp
+        files-to-copy: |
+          artifacts/polkadot
+          artifacts/polkadot-execute-worker
+          artifacts/polkadot-prepare-worker
+        destination-path: ${{ inputs.destination-path }}
+        cleanup: "true"
+
+
+    - uses: ./.github/actions/download-artifact-extract
+      with:
+        artifact-name: build-linux-stable-cumulus-${{ inputs.ref-slug }}
+        gh-token: ${{ inputs.gh-token }}
+        run-id: ${{ inputs.build-id }}
+        extract-path: ./tmp
+        files-to-copy: |
+          artifacts/polkadot-parachain
+        destination-path: ${{ inputs.destination-path }}
+        cleanup: "true"
+
+    - uses: ./.github/actions/download-artifact-extract
+      with:
+        artifact-name: build-test-parachain-${{ inputs.ref-slug }}
+        gh-token: ${{ inputs.gh-token }}
+        run-id: ${{ inputs.build-id }}
+        extract-path: ./tmp
+        files-to-copy: |
+          artifacts/test-parachain
+        destination-path: ${{ inputs.destination-path }}
+        cleanup: "true"
+
+    - uses: ./.github/actions/download-artifact-extract
+      with:
+        artifact-name: build-test-collators-${{ inputs.ref-slug }}
+        gh-token: ${{ inputs.gh-token }}
+        run-id: ${{ inputs.build-id }}
+        extract-path: ./tmp
+        files-to-copy: |
+          artifacts/adder-collator
+          artifacts/undying-collator
+        destination-path: ${{ inputs.destination-path }}
+        cleanup: "true"
+
+    - uses: ./.github/actions/download-artifact-extract
+      with:
+        artifact-name: build-malus-${{ inputs.ref-slug }}
+        gh-token: ${{ inputs.gh-token }}
+        run-id: ${{ inputs.build-id }}
+        extract-path: ./tmp
+        # TODO: should copy polkadot-execute-worker and polkadot-prepare-worker?
+        # if yes then it overlaps with build-linux-stable - address this
+        files-to-copy: |
+          artifacts/malus
+        destination-path: ${{ inputs.destination-path }}
+        cleanup: "true"
+
+    - uses: ./.github/actions/download-artifact-extract
+      with:
+        artifact-name: build-templates-node-${{ inputs.ref-slug }}
+        gh-token: ${{ inputs.gh-token }}
+        run-id: ${{ inputs.build-id }}
+        extract-path: ./tmp
+        files-to-copy: |
+          artifacts/minimal-template-node
+          artifacts/parachain-template-node
+          artifacts/solochain-template-node
+        destination-path: ${{ inputs.destination-path }}
+        cleanup: "true"

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

@@ -1,10 +1,11 @@
 name: "Zombienet-sdk test"
+description: "Runs zombienet-sdk tests with archived artifacts"
 inputs:
   build-id:
     description: ""
     required: true
   ref-slug:
-    description:
+    description: "Ref slug (e.g branch-name-short)"
     required: true
   test:
     description: "test filter to pass to nextest (e.g: functional::spam_statement_distribution_requests::spam_statement_distribution_requests_test)"
@@ -21,12 +22,6 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - name: k8s_auth
-      shell: bash
-      run: |
-        . /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
-        k8s_auth
-
     - name: common_vars
       shell: bash
       env:
@@ -35,34 +30,78 @@ runs:
       run: |
         echo "Vars"
         echo "ZOMBIENET_INTEGRATION_TEST_IMAGE: $ZOMBIENET_INTEGRATION_TEST_IMAGE"
-        echo "COL_IMAGE: $COL_IMAGE"
+        echo "ZOMBIE_PROVIDER": $ZOMBIE_PROVIDER
         echo "POLKADOT_IMAGE: $POLKADOT_IMAGE"
+        echo "CUMULUS_IMAGE: $CUMULUS_IMAGE"
+        echo "COL_IMAGE: $COL_IMAGE"
         echo "MALUS_IMAGE: $MALUS_IMAGE"
-        echo "RUN_IN_CI: $RUN_IN_CI"
         echo "Inputs"
         echo "test: $TEST_NAME"
         echo "prefix: $PREFIX"
 
-    - uses: actions/[email protected]
+    - name: Download binaries for zombienet native tests
+      if: env.ZOMBIE_PROVIDER == 'native'
+      uses: ./.github/actions/download-binaries-for-zombienet-tests
+      with:
+        gh-token: ${{ inputs.gh-token }}
+        ref-slug: ${{ inputs.ref-slug }}
+        build-id: ${{ inputs.build-id }}
+        destination-path: ./bin
+
+    - uses: ./.github/actions/download-artifact-extract
       with:
-        name: prepare-${{ inputs.prefix }}-zombienet-artifacts-${{ inputs.ref-slug }}
-        github-token: ${{ inputs.gh-token }}
+        artifact-name: prepare-${{ inputs.prefix }}-zombienet-artifacts-${{ inputs.ref-slug }}
+        gh-token: ${{ inputs.gh-token }}
         run-id: ${{ inputs.build-id }}
 
-    - name: tar
+    - name: k8s_auth
+      if: env.ZOMBIE_PROVIDER == 'k8s'
       shell: bash
-      run: tar -xvf artifacts.tar
+      run: |
+        . /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+        k8s_auth
 
     - name: zombie_test
       shell: bash
       env:
-        # zombienet-sdk expects RUN_IN_CI to be set when running in CI
-        RUN_IN_CI: 1
+        # don't retry sdk tests
+        NEXTEST_RETRIES: 0
         TEST_NAME: ${{ inputs.test }}
         PREFIX: ${{ inputs.prefix }}
       run: |
-          ls -ltr ./artifacts
-          cargo nextest run --archive-file ./artifacts/${PREFIX}-zombienet-tests.tar.zst --no-capture -- ${TEST_NAME}
+        # RUN_IN_CI=1 shall be set only for k8s provider
+        if [[ "$ZOMBIE_PROVIDER" == "native" ]]; then
+          export RUN_IN_CI=0
+          # set path to downloaded binaries
+          export PATH=$(pwd)/bin:$PATH
+          chmod +x $(pwd)/bin/*
+        else
+          export RUN_IN_CI=1
+          # no need to check other runner variables. for k8s they shall store the same value
+          if [[ $ZOMBIENET_SDK_DEFAULT_RUNNER == "parity-zombienet" ]]; then
+            export ZOMBIE_K8S_CI_NAMESPACE=$(cat /data/namespace)
+          fi
+        fi
+
+        ls -ltr ./artifacts
+        # 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}
+
+    - name: process_logs
+      if: ${{ ! cancelled() }}
+      shell: bash
+      run: |
+        echo "Processing log files"
+        echo "::group::Logs"
+        # do not fail the whole run if this step fails
+        if ! ./.github/scripts/process-logs-zombienet-sdk.sh ; then
+          echo "::endgroup::"
+          echo "::warning ::WARNING: Failed to process logs"
+        else
+          echo "::endgroup::"
+        fi
 
     - name: upload_logs
       uses: actions/upload-artifact@v4

.github/actions/zombienet/action.yml

@@ -1,4 +1,5 @@
 name: "Zombienet test v1"
+description: "Runs zombienet tests"
 inputs:
   test:
     description: "test definition (zndsl file)"
@@ -10,16 +11,19 @@ inputs:
     description: "Concurrency to spawn nodes"
     default: 4
     required: false
+  build-id:
+    description: ""
+    required: true
+  ref-slug:
+    description: "Ref slug (e.g branch-name-short)"
+    required: true
+  gh-token:
+    description: "GITHUB_TOKEN to use for downloading artifacts"
+    required: true
 
 runs:
   using: "composite"
   steps:
-    - name: k8s_auth
-      shell: bash
-      run: |
-        . /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
-        k8s_auth
-
     - name: common_vars
       shell: bash
       env:
@@ -29,23 +33,56 @@ runs:
       run: |
         echo "Vars"
         echo "ZOMBIENET_INTEGRATION_TEST_IMAGE: $ZOMBIENET_INTEGRATION_TEST_IMAGE"
+        echo "ZOMBIENET_PROVIDER: $ZOMBIENET_PROVIDER"
         echo "COL_IMAGE: $COL_IMAGE"
         echo "Inputs"
         echo "test: $TEST_NAME"
         echo "local-dir: $LOCAL_PATH"
         echo "concurrency: $CONCURRENCY"
 
+    - name: Download binaries for zombienet native tests
+      if: env.ZOMBIENET_PROVIDER == 'native'
+      uses: ./.github/actions/download-binaries-for-zombienet-tests
+      with:
+        gh-token: ${{ inputs.gh-token }}
+        ref-slug: ${{ inputs.ref-slug }}
+        build-id: ${{ inputs.build-id }}
+        destination-path: ./bin
+
+    - name: k8s_auth
+      if: env.ZOMBIENET_PROVIDER == 'k8s'
+      shell: bash
+      run: |
+        . /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+        k8s_auth
+
     - name: zombie_test
       shell: bash
       env:
         TEST_NAME: ${{ inputs.test }}
         LOCAL_PATH: ${{ inputs.local-dir }}
         CONCURRENCY: ${{ inputs.concurrency }}
       run: |
-        /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
-          --local-dir="$(pwd)/$LOCAL_PATH" \
-          --concurrency=$CONCURRENCY \
-          --test="$TEST_NAME"
+        if [[ "$ZOMBIENET_PROVIDER" == "native" ]]; then
+          # set path to downloaded binaries
+          export PATH=$(pwd)/bin:$PATH
+          chmod +x $(pwd)/bin/*
+
+          ./.github/scripts/run-zombienet-test.sh \
+            "$(pwd)/$LOCAL_PATH" \
+            $CONCURRENCY \
+            "$TEST_NAME"
+        else
+          # no need to check other runner variables. for k8s they shall store the same value
+          if [[ $ZOMBIENET_DEFAULT_RUNNER == "parity-zombienet" ]]; then
+            export ZOMBIE_NAMESPACE=$(cat /data/namespace)
+          fi
+
+          /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
+            --local-dir="$(pwd)/$LOCAL_PATH" \
+            --concurrency=$CONCURRENCY \
+            --test="$TEST_NAME"
+        fi
 
     - name: upload_logs
       uses: actions/upload-artifact@v4