Merge commit '249ea3c' into thread-next

diff --cc .gitlab-ci.yml
index 6d7492e60e1cfeb8eee717870da06f6e4f5148ea,d1f4c9d6a6fc75772270aaf57f524f2f5488024e..32ef76834ab43404f4c14b95779a2cef0d6de6b4
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -1401,7 -1398,8 +1402,8 @@@ build-netlab
      - ln -s $STAYRTR_BINARY netlab/common/stayrtr
      - cd netlab
      - sudo ./stop
 -    - sudo ./runtest -s v2 -m check $TEST_NAME
+     - ulimit -f 1048576 # Protect the filesystem from overflowing by log bloat
 +    - sudo ./runtest -s v3 -m check $TEST_NAME
    after_script:
      - DIR=$(pwd)
      - cd $TOOLS_DIR/netlab

diff --cc misc/gitlab/template.yml.j2
index 4ef0644aa78feb24f7f0628421d49a150f057d54,9b7f90c72ca306e177d1334de62abb588635a19d..164792aa3543c989626cd5acd7554dc7d99b636f
--- 1/misc/gitlab/template.yml.j2
--- 2/misc/gitlab/template.yml.j2
+++ b/misc/gitlab/template.yml.j2
@@@ -434,7 -435,8 +435,8 @@@ build-netlab
      - ln -s $STAYRTR_BINARY netlab/common/stayrtr
      - cd netlab
      - sudo ./stop
 -    - sudo ./runtest -s v2 -m check $TEST_NAME
+     - ulimit -f 1048576 # Protect the filesystem from overflowing by log bloat
 +    - sudo ./runtest -s v3 -m check $TEST_NAME
    after_script:
      - DIR=$(pwd)
      - cd $TOOLS_DIR/netlab