From: Maria Matejka <mq@ucw.cz>
Date: Thu, 22 May 2025 15:30:04 +0000 (+0200)
Subject: Merge branch 'master' (early part) into thread-next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21992662c8f34cc6b3785ec141e347f2219d5983;p=thirdparty%2Fbird.git

Merge branch 'master' (early part) into thread-next
---

21992662c8f34cc6b3785ec141e347f2219d5983
diff --cc .gitlab-ci.yml
index eb347f259,146b402f7..178abde2c
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -1124,7 -1120,12 +1124,12 @@@ build-netlab
      - ln -s $STAYRTR_BINARY netlab/common/stayrtr
      - cd netlab
      - sudo ./stop
 -    - sudo ./runtest -s v2 -m check $TEST_NAME
 +    - sudo ./runtest -s v3 -m check $TEST_NAME
+   after_script:
+     - sudo ./stop
+   artifacts:
+     when: on_failure
+     untracked: true
  
  
  test-babel-base:
diff --cc misc/gitlab/template.yml.j2
index c9a550806,27b3d66e0..bce8bcb75
--- a/misc/gitlab/template.yml.j2
+++ b/misc/gitlab/template.yml.j2
@@@ -390,7 -390,12 +390,12 @@@ build-netlab
      - ln -s $STAYRTR_BINARY netlab/common/stayrtr
      - cd netlab
      - sudo ./stop
 -    - sudo ./runtest -s v2 -m check $TEST_NAME
 +    - sudo ./runtest -s v3 -m check $TEST_NAME
+   after_script:
+     - sudo ./stop
+   artifacts:
+     when: on_failure
+     untracked: true
  
  {% for test in netlab %}
  test-{{ test["name"] }}: