ci: improve log collection and upload for all providers

Author: DenzelPenzel

.github/workflows/ci_integration.yml

@@ -76,12 +76,26 @@ jobs:
           # for running local
           # cargo test --test smoke -- --nocapture
 
+      - name: dump logs
+        if: always()
+        run: |
+          export ZOMBIE_K8S_CI_NAMESPACE=$(cat /data/namespace)
+          mkdir -p /tmp/zombie-1/logs
+          for pod in $(kubectl get pods -n "$ZOMBIE_K8S_CI_NAMESPACE" -o jsonpath='{.items[*].metadata.name}' 2>/dev/null || true); do
+            echo "Dumping logs for pod: $pod"
+            kubectl logs -n "$ZOMBIE_K8S_CI_NAMESPACE" "$pod" --all-containers=true > "/tmp/zombie-1/logs/${pod}.log" 2>&1 || true
+          done
+          # Also copy any existing node logs
+          find /tmp/zombie* -name "*.log" -exec cp {} /tmp/zombie-1/logs/ \; 2>/dev/null || true
+          ls -la /tmp/zombie-1/logs/ || true
+
       - name: upload logs
+        if: always()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: zombienet-logs-${{ github.job }}-${{ github.sha }}
           path: |
-            /tmp/zombie*/logs/*
+            /tmp/zombie-1/logs/*
 
   docker-integration-test-smoke:
     runs-on: parity-default
@@ -111,13 +125,26 @@ jobs:
           tar xvfz artifacts.tar.gz
           ./artifacts/smoke --nocapture
 
+      - name: dump logs
+        if: always()
+        run: |
+          mkdir -p /tmp/zombie-1/logs
+          # Dump logs from all zombienet containers
+          for container in $(docker ps -a --filter "name=zombie" --format "{{.Names}}" 2>/dev/null || true); do
+            echo "Dumping logs for container: $container"
+            docker logs "$container" > "/tmp/zombie-1/logs/${container}.log" 2>&1 || true
+          done
+          # Also copy any existing node logs
+          find /tmp/zombie* -name "*.log" -exec cp {} /tmp/zombie-1/logs/ \; 2>/dev/null || true
+          ls -la /tmp/zombie-1/logs/ || true
+
       - name: upload logs
         if: always()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: zombienet-logs-${{ github.job }}-${{ github.sha }}
           path: |
-            /tmp/zombie*/logs/*
+            /tmp/zombie-1/logs/*
 
   native-integration-test-smoke:
     runs-on: parity-default
@@ -156,9 +183,18 @@ jobs:
           ./artifacts/smoke_native --nocapture
           # cargo test --test smoke-native -- --nocapture
 
+      - name: collect logs
+        if: always()
+        run: |
+          mkdir -p /tmp/zombie-1/logs
+          # Copy all node logs to a single directory for upload
+          find /tmp/zombie* -name "*.log" -exec cp {} /tmp/zombie-1/logs/ \; 2>/dev/null || true
+          ls -la /tmp/zombie-1/logs/ || true
+
       - name: upload logs
+        if: always()
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
         with:
           name: zombienet-logs-${{ github.job }}-${{ github.sha }}
           path: |
-            /tmp/zombie*/logs/*
+            /tmp/zombie-1/logs/*

crates/orchestrator/src/generators/keystore_key_types.rs

@@ -72,9 +72,9 @@ fn get_predefined_schemes(is_asset_hub_polkadot: bool) -> HashMap<&'static str,
 
     // aura has special handling for asset-hub-polkadot
     if is_asset_hub_polkadot {
-        schemes.insert("aura", KeyScheme::Ed);
-    } else {
         schemes.insert("aura", KeyScheme::Sr);
+    } else {
+        schemes.insert("aura", KeyScheme::Ed);
     }
 
     schemes.insert("babe", KeyScheme::Sr);