Merge branch 'master' into as-upd-rust

paritytech · Sep 20, 2024 · c083dac · c083dac
2 parents 96d65e5 + 515fcc9
commit c083dac
Show file tree

Hide file tree

Showing 59 changed files with 1,030 additions and 372 deletions.
diff --git a/.gitlab/pipeline/zombienet/parachain-template.yml b/.gitlab/pipeline/zombienet/parachain-template.yml
@@ -17,6 +17,8 @@
     RUST_LOG: "info,zombienet_orchestrator=debug"
     FF_DISABLE_UMASK_FOR_DOCKER_EXECUTOR: 1
     RUN_IN_CONTAINER: "1"
+    RUNNER_SCRIPT_TIMEOUT: 15m
+    RUNNER_AFTER_SCRIPT_TIMEOUT: 5m
   artifacts:
     name: "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
     when: always
@@ -25,9 +27,9 @@
       - ./zombienet-logs
   after_script:
     - mkdir -p ./zombienet-logs
-    - cp /tmp/zombie*/logs/* ./zombienet-logs/
+    - cp /tmp/zombie*/*/*.log ./zombienet-logs/
   retry: 2
-  timeout: 15m
+  timeout: 20m
   tags:
     - linux-docker