Merge branch 'master' (early part) into thread-next

diff --cc .gitlab-ci.yml
index eb347f25919e9c9a0f62276c7ed0f1a940f94389,146b402f7a55e73ac6801cdb2b1f3b4b10299db1..178abde2ce18fb2d06554c5ff026cf14a5b82cce
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -1124,7 -1120,12 +1124,12 @@@ build-netlab
      - 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
+   after_script:
+     - sudo ./stop
+   artifacts:
+     when: on_failure
+     untracked: true
  
  
  test-babel-base:

diff --cc misc/gitlab/template.yml.j2
index c9a55080660b291a18fdad10a4d5d9466f89f9c8,27b3d66e0e56298890aa6632fab20d0cf6c28e42..bce8bcb75d69d4ea3288094cd550e7e175f34942
--- 1/misc/gitlab/template.yml.j2
--- 2/misc/gitlab/template.yml.j2
+++ b/misc/gitlab/template.yml.j2
@@@ -390,7 -390,12 +390,12 @@@ build-netlab
      - 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
+   after_script:
+     - sudo ./stop
+   artifacts:
+     when: on_failure
+     untracked: true
  
  {% for test in netlab %}
  test-{{ test["name"] }}: