merging donal-ahm with master

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

@@ -21,12 +21,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:
@@ -61,6 +55,7 @@ runs:
         TEST_NAME: ${{ inputs.test }}
         PREFIX: ${{ inputs.prefix }}
       run: |
+          export ZOMBIE_K8S_CI_NAMESPACE=$(cat /data/namespace)
           ls -ltr ./artifacts
           cargo nextest run --archive-file ./artifacts/${PREFIX}-zombienet-tests.tar.zst --no-capture -- ${TEST_NAME}
 

.github/actions/zombienet/action.yml

@@ -14,12 +14,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:
@@ -42,6 +36,7 @@ runs:
         LOCAL_PATH: ${{ inputs.local-dir }}
         CONCURRENCY: ${{ inputs.concurrency }}
       run: |
+        export ZOMBIE_K8S_CI_NAMESPACE=$(cat /data/namespace)
         /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
           --local-dir="$(pwd)/$LOCAL_PATH" \
           --concurrency=$CONCURRENCY \

.github/workflows/misc-sync-templates.yml

@@ -69,12 +69,8 @@ jobs:
             srtool build --package ${{ matrix.package_name }} --runtime-dir ${{ matrix.runtime_path }} --root
 
             # Generate chain spec
-            # Note that para-id is set to 1000 for both minimal/parachain templates. 
-            # `parachain-runtime` is hardcoded to use this parachain id. 
-            # `minimal` template isn't using it, but when started with Omni Node, this para id is required (any number can do it, so setting it to 1000 for convenience).
             chain-spec-builder -c dev_chain_spec.json create \
               --relay-chain "${{ matrix.relay_chain }}" \
-              --para-id 1000 \
               --runtime "${{ matrix.runtime_path }}/target/srtool/release/wbuild/${{ matrix.runtime_wasm_path }}" \
               named-preset development
 
@@ -162,9 +158,9 @@ jobs:
           [workspace]
           EOF
 
-          [ ${{ matrix.template }} != "solochain" ] && echo "# Leave out the node compilation from regular template usage." \
+          [ ${{ matrix.template }} == "parachain" ] && echo "# Leave out the node compilation from regular template usage." \
             && echo "default-members = [\"pallets/template\", \"runtime\"]" >> Cargo.toml
-          [ ${{ matrix.template }} == "solochain" ] && echo "# The node isn't yet replaceable by Omni Node."
+          [ ${{ matrix.template }} != "parachain" ] && echo "# The node isn't yet replaceable by Omni Node."
           cat << EOF >> Cargo.toml
           members = [
               "node",

.github/workflows/zombienet_cumulus.yml

@@ -17,6 +17,13 @@ env:
   FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
   LOCAL_DIR: "./cumulus/zombienet/tests"
   GHA_CLUSTER_SERVER_ADDR: "https://kubernetes.default:443"
+  # use spot by default
+  X_INFRA_INSTANCE: "spot"
+  # don't retry sdk tests
+  NEXTEST_RETRIES: 0
+  KUBECONFIG: "/data/config"
+  ZOMBIE_CLEANER_DISABLED: 1
+
 
 # only run if we have changes in [subtrate, cumulus, polkadot] directories or this workflow.
 jobs:
@@ -67,22 +74,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: script
-        run: |
-          echo "RELAY_IMAGE: $RELAY_IMAGE"
-          echo "COL_IMAGE: $COL_IMAGE"
-          export DEBUG=${{ needs.preflight.outputs.DEBUG }}
-          /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
-            --local-dir="$(pwd)/$LOCAL_DIR" \
-            --concurrency=1 \
-            --test="0002-pov_recovery.zndsl"
-
-      - name: upload logs
-        uses: actions/upload-artifact@v4
+      #
+      - name: zombienet_test
+        uses: ./.github/actions/zombienet
         with:
-          name: zombienet-logs-${{ github.job }}-${{ github.sha }}
-          path: |
-            /tmp/zombie*/logs/*
+          test: "0002-pov_recovery.zndsl"
+          local-dir: "${{ env.LOCAL_DIR }}"
+          concurrency: 1
 
   zombienet-cumulus-0003-full_node_catching_up:
     needs: [preflight]
@@ -98,22 +96,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: script
-        run: |
-          echo "RELAY_IMAGE: $RELAY_IMAGE"
-          echo "COL_IMAGE: $COL_IMAGE"
-          export DEBUG=${{ needs.preflight.outputs.DEBUG }}
-          /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
-            --local-dir="$(pwd)/$LOCAL_DIR" \
-            --concurrency=1 \
-            --test="0003-full_node_catching_up.zndsl"
-
-      - name: upload logs
-        uses: actions/upload-artifact@v4
+      #
+      - name: zombienet_test
+        uses: ./.github/actions/zombienet
         with:
-          name: zombienet-logs-${{ github.job }}-${{ github.sha }}
-          path: |
-            /tmp/zombie*/logs/*
+          test: "0003-full_node_catching_up.zndsl"
+          local-dir: "${{ env.LOCAL_DIR }}"
+          concurrency: 1
 
   zombienet-cumulus-0004-runtime_upgrade:
     needs: [preflight]
@@ -138,25 +127,20 @@ jobs:
       - name: tar
         run: tar -xvf artifacts.tar
 
-      - name: script
+      - name: cp
+        shell: bash
         run: |
-          echo "RELAY_IMAGE: $RELAY_IMAGE"
-          echo "COL_IMAGE: $COL_IMAGE"
           ls -ltr *
           cp ./artifacts/zombienet/wasm_binary_spec_version_incremented.rs.compact.compressed.wasm /tmp/
           ls /tmp
-          export DEBUG=${{ needs.preflight.outputs.DEBUG }}
-          /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
-            --local-dir="$(pwd)/$LOCAL_DIR" \
-            --concurrency=1 \
-            --test="0004-runtime_upgrade.zndsl"
 
-      - name: upload logs
-        uses: actions/upload-artifact@v4
+      #
+      - name: zombienet_test
+        uses: ./.github/actions/zombienet
         with:
-          name: zombienet-logs-${{ github.job }}-${{ github.sha }}
-          path: |
-            /tmp/zombie*/logs/*
+          test: "0004-runtime_upgrade.zndsl"
+          local-dir: "${{ env.LOCAL_DIR }}"
+          concurrency: 1
 
   zombienet-cumulus-0005-migrate_solo_to_para:
     needs: [preflight]
@@ -172,22 +156,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: script
-        run: |
-          echo "RELAY_IMAGE: $RELAY_IMAGE"
-          echo "COL_IMAGE: $COL_IMAGE"
-          export DEBUG=${{ needs.preflight.outputs.DEBUG }}
-          /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
-            --local-dir="$(pwd)/$LOCAL_DIR" \
-            --concurrency=1 \
-            --test="0005-migrate_solo_to_para.zndsl"
-
-      - name: upload logs
-        uses: actions/upload-artifact@v4
+      #
+      - name: zombienet_test
+        uses: ./.github/actions/zombienet
         with:
-          name: zombienet-logs-${{ github.job }}-${{ github.sha }}
-          path: |
-            /tmp/zombie*/logs/*
+          test: "0005-migrate_solo_to_para.zndsl"
+          local-dir: "${{ env.LOCAL_DIR }}"
+          concurrency: 1
 
   zombienet-cumulus-0006-rpc_collator_builds_blocks:
     needs: [preflight]
@@ -203,22 +178,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: script
-        run: |
-          echo "RELAY_IMAGE: $RELAY_IMAGE"
-          echo "COL_IMAGE: $COL_IMAGE"
-          export DEBUG=${{ needs.preflight.outputs.DEBUG }}
-          /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
-            --local-dir="$(pwd)/$LOCAL_DIR" \
-            --concurrency=1 \
-            --test="0006-rpc_collator_builds_blocks.zndsl"
-
-      - name: upload logs
-        uses: actions/upload-artifact@v4
+      #
+      - name: zombienet_test
+        uses: ./.github/actions/zombienet
         with:
-          name: zombienet-logs-${{ github.job }}-${{ github.sha }}
-          path: |
-            /tmp/zombie*/logs/*
+          test: "0006-rpc_collator_builds_blocks.zndsl"
+          local-dir: "${{ env.LOCAL_DIR }}"
+          concurrency: 1
 
   zombienet-cumulus-0007-full_node_warp_sync:
     needs: [preflight]
@@ -234,22 +200,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: script
-        run: |
-          echo "RELAY_IMAGE: $RELAY_IMAGE"
-          echo "COL_IMAGE: $COL_IMAGE"
-          export DEBUG=${{ needs.preflight.outputs.DEBUG }}
-          /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
-            --local-dir="$(pwd)/$LOCAL_DIR" \
-            --concurrency=1 \
-            --test="0007-full_node_warp_sync.zndsl"
-
-      - name: upload logs
-        uses: actions/upload-artifact@v4
+      #
+      - name: zombienet_test
+        uses: ./.github/actions/zombienet
         with:
-          name: zombienet-logs-${{ github.job }}-${{ github.sha }}
-          path: |
-            /tmp/zombie*/logs/*
+          test: "0007-full_node_warp_sync.zndsl"
+          local-dir: "${{ env.LOCAL_DIR }}"
+          concurrency: 1
+
 
   zombienet-cumulus-0008-elastic_authoring:
     needs: [preflight]
@@ -265,22 +223,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: script
-        run: |
-          echo "RELAY_IMAGE: $RELAY_IMAGE"
-          echo "COL_IMAGE: $COL_IMAGE"
-          export DEBUG=${{ needs.preflight.outputs.DEBUG }}
-          /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
-            --local-dir="$(pwd)/$LOCAL_DIR" \
-            --concurrency=1 \
-            --test="0008-elastic_authoring.zndsl"
-
-      - name: upload logs
-        uses: actions/upload-artifact@v4
+      #
+      - name: zombienet_test
+        uses: ./.github/actions/zombienet
         with:
-          name: zombienet-logs-${{ github.job }}-${{ github.sha }}
-          path: |
-            /tmp/zombie*/logs/*
+          test: "0008-elastic_authoring.zndsl"
+          local-dir: "${{ env.LOCAL_DIR }}"
+          concurrency: 1
 
   zombienet-cumulus-0009-elastic_pov_recovery:
     needs: [preflight]
@@ -296,22 +245,13 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: script
-        run: |
-          echo "RELAY_IMAGE: $RELAY_IMAGE"
-          echo "COL_IMAGE: $COL_IMAGE"
-          export DEBUG=${{ needs.preflight.outputs.DEBUG }}
-          /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh \
-            --local-dir="$(pwd)/$LOCAL_DIR" \
-            --concurrency=1 \
-            --test="0009-elastic_pov_recovery.zndsl"
-
-      - name: upload logs
-        uses: actions/upload-artifact@v4
+      #
+      - name: zombienet_test
+        uses: ./.github/actions/zombienet
         with:
-          name: zombienet-logs-${{ github.job }}-${{ github.sha }}
-          path: |
-            /tmp/zombie*/logs/*
+          test: "0009-elastic_pov_recovery.zndsl"
+          local-dir: "${{ env.LOCAL_DIR }}"
+          concurrency: 1
 
   zombienet-cumulus-0010-elastic_scaling_multiple_block_per_slot:
     needs: [preflight]

.github/workflows/zombienet_polkadot.yml

@@ -21,6 +21,8 @@ env:
   X_INFRA_INSTANCE: "spot"
   # don't retry sdk tests
   NEXTEST_RETRIES: 0
+  KUBECONFIG: "/data/config"
+  ZOMBIE_CLEANER_DISABLED: 1
 
 # only run if we have changes in [subtrate, polkadot] directories or this workflow.
 jobs:
@@ -290,32 +292,6 @@ jobs:
           local-dir: "${{ env.LOCAL_DIR }}/functional"
   #
   #
-  zombienet-polkadot-functional-0018-shared-core-idle-parachain:
-    needs: [preflight]
-    if: ${{ (needs.preflight.outputs.changes_substrate || needs.preflight.outputs.changes_polkadot) &&  ! contains(needs.preflight.outputs.FLAKY_TESTS, 'zombienet-polkadot-functional-0018-shared-core-idle-parachain') }}
-    runs-on: ${{ needs.preflight.outputs.ZOMBIENET_RUNNER }} # NOTE: should be zombienet-arc-runner (without quotes)
-    timeout-minutes: 60
-    container:
-      image: ${{ needs.preflight.outputs.ZOMBIENET_IMAGE }}
-    env:
-      ZOMBIENET_INTEGRATION_TEST_IMAGE: "${{ needs.preflight.outputs.TEMP_IMAGES_BASE }}/polkadot-debug:${{ needs.preflight.outputs.DOCKER_IMAGES_VERSION }}"
-      CUMULUS_IMAGE: "${{ needs.preflight.outputs.TEMP_IMAGES_BASE }}/polkadot-parachain-debug:${{ needs.preflight.outputs.DOCKER_IMAGES_VERSION }}"
-      DEBUG: ${{ needs.preflight.outputs.DEBUG }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: cp_script
-        run: |
-          cp --remove-destination ${LOCAL_DIR}/assign-core.js ${LOCAL_DIR}/functional
-
-      - name: zombienet_test
-        uses: ./.github/actions/zombienet
-        with:
-          test: "0018-shared-core-idle-parachain.zndsl"
-          local-dir: "${{ env.LOCAL_DIR }}/functional"
-  #
-  #
   zombienet-polkadot-functional-0019-coretime-collation-fetching-fairness:
     needs: [preflight]
     if: ${{ (needs.preflight.outputs.changes_substrate || needs.preflight.outputs.changes_polkadot) &&  ! contains(needs.preflight.outputs.FLAKY_TESTS, 'zombienet-polkadot-functional-0019-coretime-collation-fetching-fairness') }}
@@ -880,3 +856,32 @@ jobs:
           ref-slug: ${{ needs.preflight.outputs.SOURCE_REF_SLUG }}
           test: "functional::approved_peer_mixed_validators::approved_peer_mixed_validators_test"
           prefix: "polkadot"
+
+  #
+  #
+  zombienet-polkadot-shared-core-idle-parachain:
+    needs: [preflight]
+    if: ${{ (needs.preflight.outputs.changes_substrate || needs.preflight.outputs.changes_polkadot) &&  ! contains(needs.preflight.outputs.FLAKY_TESTS, 'zombienet-polkadot-functional-spam-statement-distribution-requests') }}
+    runs-on: ${{ needs.preflight.outputs.ZOMBIENET_RUNNER }} # NOTE: should be zombienet-arc-runner (without quotes)
+    timeout-minutes: 60
+    container:
+      image: ${{ needs.preflight.outputs.ZOMBIENET_IMAGE }}
+    env:
+      # sdk tests are looking for POLKADOT_IMAGE
+      POLKADOT_IMAGE: "${{ needs.preflight.outputs.TEMP_IMAGES_BASE }}/polkadot-debug:${{ needs.preflight.outputs.DOCKER_IMAGES_VERSION }}"
+      CUMULUS_IMAGE: "${{ needs.preflight.outputs.TEMP_IMAGES_BASE }}/polkadot-parachain-debug:${{ needs.preflight.outputs.DOCKER_IMAGES_VERSION }}"
+      RUST_LOG: ${{ needs.preflight.outputs.RUST_LOG }}
+      ZOMBIE_PROVIDER: ${{ needs.preflight.outputs.ZOMBIE_PROVIDER }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: zombienet_test
+        uses: ./.github/actions/zombienet-sdk
+        with:
+          gh-token: ${{ secrets.GITHUB_TOKEN }}
+          build-id: ${{ needs.preflight.outputs.BUILD_RUN_ID }}
+          ref-slug: ${{ needs.preflight.outputs.SOURCE_REF_SLUG }}
+          test: "functional::shared_core_idle_parachain::shared_core_idle_parachain_test"
+          prefix: "polkadot"