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

diff --cc .gitlab-ci.yml
index 2ad85a58d01872303c3275a86b877e2452f4e2f2,636ae6f1749c36ea3412511cba0ca6d0a3747ece..32c693248bd7964c9e3946ef3d8d452a7d7ddca5
--- 1/.gitlab-ci.yml
--- 2/.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