From: Maria Matejka <mq@ucw.cz>
Date: Tue, 1 Apr 2025 18:12:11 +0000 (+0200)
Subject: Merge commit '1236600' into thread-next
X-Git-Tag: v3.1.0~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cfd83770539d9756460f976e652f7c7584c1e7dc;p=thirdparty%2Fbird.git

Merge commit '1236600' into thread-next
---

cfd83770539d9756460f976e652f7c7584c1e7dc
diff --cc .gitlab-ci.yml
index 02f22809f,25cb9fc50..99904465f
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -679,15 -712,9 +721,9 @@@ build-netlab
      - netlab
      - amd64
    script:
-     - 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
+     - cd $TOOLS_DIR/netlab
      - sudo ./stop
 -    - sudo ./runtest -s v2 -m check $TEST_NAME
 +    - sudo ./runtest -s v3 -m check $TEST_NAME
  
  test-ospf-base:
    <<: *test-base