From: Maria Matejka <mq@ucw.cz>
Date: Tue, 1 Apr 2025 17:46:37 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master' into thread-next
X-Git-Tag: v3.1.0~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7ff5aa1d52cd159cbb2c0678e73e39ecaedb26c;p=thirdparty%2Fbird.git

Merge remote-tracking branch 'origin/master' into thread-next
---

e7ff5aa1d52cd159cbb2c0678e73e39ecaedb26c
diff --cc .gitlab-ci.yml
index 2ad85a58d,636ae6f17..32c693248
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -406,9 -409,15 +409,15 @@@ build-netlab
      - netlab
      - amd64
    script:
-     - cd $TOOLS_DIR/netlab
+     - DIR=$(pwd)
+     - cd $TOOLS_DIR
+     - sudo git clean -fx
+     - git pull --ff-only
+     - mv $DIR/build-netlab/* netlab/common/
+     - 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
  
  test-ospf-base:
    <<: *test-base