Run respdiff CI in new docker image

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 871ff5f7a3eeb4fef4cb06695160fd226d8b6430..bc5dcbd577f5014cd8626be501ac31a56eb17c0b 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,7 +52,6 @@ test:linux:amd64:valgrind:
     - amd64
 
 respdiff:linux:amd64:
-  image: cznic/ubuntu-respdif:16.04
   stage: test
   script:
     - PREFIX=$(pwd)/.local ./ci/respdiff/start-resolvers.sh
@@ -60,6 +59,8 @@ respdiff:linux:amd64:
     - cat ./results/respdiff.txt
     - echo 'test if mismatch rate >= 1 %'
     - grep -q '^target diagrees.*0\.[0-9][0-9] %' ./results/respdiff.txt
+  dependencies:
+    - build:linux:amd64
   artifacts:
     when: always
     expire_in: '1 week'
@@ -69,8 +70,6 @@ respdiff:linux:amd64:
     - docker
     - linux
     - amd64
-  dependencies:
-    - build:linux:amd64
 
 #arm_build:
 #  image: cznic/armhf-ubuntu:16.04

diff --git a/ci/Dockerfile b/ci/Dockerfile
index a6a2fd9cc00b6599d07304ab30cb8d4fa25a69a3..712e9163c1f35f9f964c49d1547b39c230bb6fee 100644 (file)
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -5,14 +5,32 @@ WORKDIR /root
 CMD ["/bin/bash"]
 
 # name: cznic/ci-debian-kresd
+
+# install dependecies
 RUN apt-get update -qq
 RUN apt-get install -y -qqq apt-utils
 RUN apt-get upgrade -y -qqq
-RUN apt-get install -y -qqq make cmake pkg-config git build-essential bsdmainutils libtool autoconf make pkg-config liburcu-dev libgnutls28-dev libedit-dev liblmdb-dev libcap-ng-dev libsystemd-dev libidn11-dev protobuf-c-compiler libfstrm-dev pkg-config libknot-dev libuv1-dev libcmocka-dev libluajit-5.1-dev # dependencies for knot-resolver
-RUN apt-get install -y -qqq valgrind python3 python3-dev python3-jinja2 python3-pip python3-yaml libffi-dev libaugeas-dev python3-pep8
+RUN apt-get install -y -qqq make cmake pkg-config git build-essential bsdmainutils libtool autoconf make pkg-config liburcu-dev libgnutls28-dev libedit-dev liblmdb-dev libcap-ng-dev libsystemd-dev libidn11-dev protobuf-c-compiler libfstrm-dev pkg-config libknot-dev libuv1-dev libcmocka-dev libluajit-5.1-dev valgrind python3 python3-dev python3-jinja2 python3-pip python3-yaml libffi-dev libaugeas-dev python3-pep8 unzip wget lua-sec lua-socket
 RUN apt-get purge python3-dnspython
 RUN pip3 install --upgrade pip
 RUN pip3 install --user dnspython python-augeas
 RUN pip3 install pylint
+
+#install unbound
+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
+
+#install bind
+RUN apt-get install bind9 -y -qqq
+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
+
+#download respdiff
+RUN wget https://gitlab.labs.nic.cz/knot/resolver-benchmarking/repository/archive.zip -O respdiff.zip
+RUN unzip respdiff.zip
+RUN cp -R resolver-benchmarking*/response_differences/respdiff /var/opt/respdiff
+RUN pip3 install -r resolver-benchmarking*/requirements.txt
+RUN rm -rf respdiff.zip resolver-benchmarking*
+
+#build knot
 RUN git clone https://gitlab.labs.nic.cz/knot/knot-dns.git /tmp/knot
 RUN cd /tmp/knot && autoreconf -if && ./configure && make && make install && ldconfig