Merge branch 'ci-respdiff' into 'master'

ci: respdiff - use ipv4, increase timeout, collect kresd.log

See merge request !473

.gitlab-ci.yml

@@ -187,8 +187,8 @@ respdiff:iter:udp:linux:amd64:
     - PREFIX=$(pwd)/.local ./ci/respdiff/start-resolvers.sh
     - ./ci/respdiff/run-respdiff-tests.sh udp
     - cat results/respdiff.txt
-    - echo 'test if mismatch rate >= 3 %'
-    - grep -q '^target disagrees.*[0-2]\.[0-9][0-9] %' results/respdiff.txt
+    - echo 'test if mismatch rate >= 1 %'
+    - grep -q '^target disagrees.*0\.[0-9][0-9] %' results/respdiff.txt
     - killall --wait kresd
     - PREFIX=$(pwd)/.local MAKEFLAGS="--jobs $(nproc)" make coverage-c coverage-lua COVERAGE_STAGE=gcov-respdiff-iter-udp
   dependencies:
@@ -197,6 +197,7 @@ respdiff:iter:udp:linux:amd64:
     when: always
     expire_in: '1 week'
     paths:
+      - kresd.log.xz
       - results/*.txt
       - results/respdiff.db/data.mdb.xz
       - ./*.info
@@ -212,8 +213,8 @@ respdiff:iter:tcp:linux:amd64:
     - PREFIX=$(pwd)/.local ./ci/respdiff/start-resolvers.sh
     - ./ci/respdiff/run-respdiff-tests.sh tcp
     - cat results/respdiff.txt
-    - echo 'test if mismatch rate >= 3 %'
-    - grep -q '^target disagrees.*[0-2]\.[0-9][0-9] %' results/respdiff.txt
+    - echo 'test if mismatch rate >= 1 %'
+    - grep -q '^target disagrees.*0\.[0-9][0-9] %' results/respdiff.txt
     - killall --wait kresd
     - PREFIX=$(pwd)/.local MAKEFLAGS="--jobs $(nproc)" make coverage-c coverage-lua COVERAGE_STAGE=gcov-respdiff-iter-tcp
   dependencies:
@@ -222,6 +223,7 @@ respdiff:iter:tcp:linux:amd64:
     when: always
     expire_in: '1 week'
     paths:
+      - kresd.log.xz
       - results/*.txt
       - results/respdiff.db/data.mdb.xz
       - ./*.info
@@ -237,8 +239,8 @@ respdiff:iter:tls:linux:amd64:
     - PREFIX=$(pwd)/.local ./ci/respdiff/start-resolvers.sh
     - ./ci/respdiff/run-respdiff-tests.sh tls
     - cat results/respdiff.txt
-    - echo 'test if mismatch rate >= 3 %'
-    - grep -q '^target disagrees.*[0-2]\.[0-9][0-9] %' results/respdiff.txt
+    - echo 'test if mismatch rate >= 1 %'
+    - grep -q '^target disagrees.*0\.[0-9][0-9] %' results/respdiff.txt
     - killall --wait kresd
     - PREFIX=$(pwd)/.local MAKEFLAGS="--jobs $(nproc)" make coverage-c coverage-lua COVERAGE_STAGE=gcov-respdiff-iter-tls
   dependencies:
@@ -247,6 +249,7 @@ respdiff:iter:tls:linux:amd64:
     when: always
     expire_in: '1 week'
     paths:
+      - kresd.log.xz
       - results/*.txt
       - results/respdiff.db/data.mdb.xz
       - ./*.info

ci/Dockerfile

@@ -61,10 +61,11 @@ RUN pip3 install flake8
 
 # Unbound for respdiff
 RUN apt-get install unbound unbound-anchor -y -qqq
-RUN printf "server:\n interface: 127.0.0.1@53535\n use-syslog: yes\nremote-control:\n control-enable: no\n" >> /etc/unbound/unbound.conf
+RUN printf "server:\n interface: 127.0.0.1@53535\n use-syslog: yes\n do-ip6: no\nremote-control:\n control-enable: no\n" >> /etc/unbound/unbound.conf
 
 # BIND for respdiff
 RUN apt-get install bind9 -y -qqq
+RUN printf '\nOPTIONS="-4 $OPTIONS"' >> /etc/default/bind9
 RUN printf 'options {\n directory "/var/cache/bind";\n listen-on port 53533 { 127.0.0.1; };\n listen-on-v6 port 53533 { ::1; };\n};\n' > /etc/bind/named.conf.options
 
 # PowerDNS Recursor for Deckard CI

ci/respdiff/kresd.config

 -- Refer to manual: https://knot-resolver.readthedocs.io/en/latest/daemon.html#configuration
 -- Listen on localhost and external interface
 net.listen('127.0.0.1', 5353)
-net.listen('::1', 5353)
 net.listen('127.0.0.1', 8853, { tls = true })
-net.listen('::1', 8853, { tls = true })
+net.ipv6=false
 
 -- Auto-maintain root TA
 trust_anchors.file = '.local/etc/knot-resolver/root.keys'
@@ -22,4 +21,4 @@ modules = {
 	'stats',    -- Track internal statistics
 }
 
-verbose(false)
+verbose(true)

ci/respdiff/respdiff-tcp.conf

 [sendrecv]
 # in seconds
-timeout = 5
+timeout = 11
 # number of queries to run simultaneously
 jobs = 64
 
@@ -12,7 +12,7 @@ names = kresd, bind, unbound
 # each symbolic name in [servers] section refers to config section
 # containing IP address and port of particular server
 [kresd]
-ip = ::1
+ip = 127.0.0.1
 port = 5353
 transport = tcp
 

ci/respdiff/respdiff-tls.conf

 [sendrecv]
 # in seconds
-timeout = 5
+timeout = 11
 # number of queries to run simultaneously
 jobs = 64
 
@@ -12,7 +12,7 @@ names = kresd, bind, unbound
 # each symbolic name in [servers] section refers to config section
 # containing IP address and port of particular server
 [kresd]
-ip = ::1
+ip = 127.0.0.1
 port = 8853
 transport = tls
 

ci/respdiff/respdiff-udp.conf

 [sendrecv]
 # in seconds
-timeout = 5
+timeout = 11
 # number of queries to run simultaneously
 jobs = 64
 
@@ -12,7 +12,7 @@ names = kresd, bind, unbound
 # each symbolic name in [servers] section refers to config section
 # containing IP address and port of particular server
 [kresd]
-ip = ::1
+ip = 127.0.0.1
 port = 5353
 transport = udp
 

ci/respdiff/run-respdiff-tests.sh

@@ -12,7 +12,8 @@ CONFIG="$(pwd)/ci/respdiff/respdiff-${1}.conf"
 time /var/opt/respdiff/orchestrator.py respdiff.db -c "${CONFIG}"
 time /var/opt/respdiff/msgdiff.py respdiff.db -c "${CONFIG}"
 /var/opt/respdiff/diffsum.py respdiff.db -c "${CONFIG}" > results/respdiff.txt
-: minimize LMDB size so it can be effectively archived
+: minimize LMDB and log size so they can be effectively archived
 mkdir results/respdiff.db
 mdb_copy -c respdiff.db results/respdiff.db
 xz -9 results/respdiff.db/data.mdb
+xz kresd.log

ci/respdiff/start-resolvers.sh

@@ -7,5 +7,5 @@ service bind9 start && service bind9 status;
 # dig @localhost -p 53533
 
 #run kresd
-LD_LIBRARY_PATH=$PREFIX/lib $PREFIX/sbin/kresd -f 1 -q -c $(pwd)/ci/respdiff/kresd.config &
+LD_LIBRARY_PATH=$PREFIX/lib $PREFIX/sbin/kresd -f 1 -q -c $(pwd)/ci/respdiff/kresd.config &>kresd.log &
 # dig @localhost -p 5353