Merge commit '1236600' into thread-next

diff --cc .gitlab-ci.yml
index 02f22809f5b1f4b0d1e4403d65be2628016e9a98,25cb9fc50843c361976478b0ab6208d45ec21bce..99904465f07ab54e5d008749d919dfb52a565f98
--- 1/.gitlab-ci.yml
--- 2/.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