Merge remote-tracking branch 'origin/mq-test-submodule' into HEAD

diff --cc .gitlab-ci.yml
index 0a758cff48a3ca8b64470929fdf293845084b79a,6952239cebcbeb98a0079a6ae4585ea80484d82d..c2032ec2b10e3ae7d419f0f67263f5c91717655e
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -514,9 -535,8 +510,8 @@@ build-birdlab
      - birdlab
      - amd64
    script:
-     - cd $TOOLS_DIR/netlab
-     - sudo ./stop
-     - sudo ./runtest -m check $TEST_NAME
+     - cd aux-tools/netlab
 -    - make -f tests-v2.mk NETLAB_TEST_SHOW_OUTPUT=1 netlab-test-$TEST_NAME
++    - make -f tests-v3.mk NETLAB_TEST_SHOW_OUTPUT=1 netlab-test-$TEST_NAME
  
  test-ospf-base:
    <<: *test-base
@@@ -581,8 -601,8 +576,13 @@@ test-bgp-auth
  test-bgp-int:
    <<: *test-base
    variables:
-     TEST_NAME: cf-bgp-int
+     TEST_NAME: bgp-int
+ 
++test-bgp-int-chtab:
++  <<: *test-base
++  variables:
++    TEST_NAME: bgp-int-chtab
 +
  test-bgp-merged:
    <<: *test-base
    variables:

diff --cc Makefile.in
index fa53487292fc16ab9d86d27b2c7fff1ba7e3276e,6cb21b0d113c0e87e14f3904d13405889b52714b..a4401e2b3a1ae4a5933df7e3769806ffb393e333
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -23,6 -23,9 +23,9 @@@ INSTALL=@INSTALL
  INSTALL_PROGRAM=@INSTALL_PROGRAM@
  INSTALL_DATA=@INSTALL_DATA@
  
 -NETLAB_DATA_SUFFIX=v2
+ STAYRTR_BINARY=@STAYRTR_BINARY@
++NETLAB_DATA_SUFFIX=v3
+ 
  client=$(addprefix $(exedir)/,@CLIENT@)
  daemon=$(exedir)/bird
  protocols=@protocols@

diff --cc configure.ac
Simple merge