From: Maria Matejka <mq@ucw.cz>
Date: Fri, 23 May 2025 13:03:16 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into mq-merge-master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01c3b07e20e6b6161582972eaabb269d603eb7d4;p=thirdparty%2Fbird.git

Merge remote-tracking branch 'origin/master' into mq-merge-master
---

01c3b07e20e6b6161582972eaabb269d603eb7d4
diff --cc .gitlab-ci.yml
index d7fa2021b,df06e0608..84b9342a2
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -1124,8 -1120,9 +1124,9 @@@ 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:
+     - cd $TOOLS_DIR/netlab
      - sudo ./stop
    artifacts:
      when: on_failure
diff --cc misc/gitlab/template.yml.j2
index ed534c390,046be964f..2c2ebefc6
--- a/misc/gitlab/template.yml.j2
+++ b/misc/gitlab/template.yml.j2
@@@ -390,8 -390,9 +390,9 @@@ 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:
+     - cd $TOOLS_DIR/netlab
      - sudo ./stop
    artifacts:
      when: on_failure