From a9081f95da8b7e837b7904993dc63aeb527e0988 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kotek?= Date: Wed, 11 Oct 2017 09:31:48 +0200 Subject: [PATCH] Run valgrind CI checks with new docker image --- .gitlab-ci.yml | 1 - ci/Dockerfile | 3 +++ ci/valgrind/Dockerfile | 11 ----------- 3 files changed, 3 insertions(+), 12 deletions(-) delete mode 100644 ci/valgrind/Dockerfile diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 832fbbba8..58ceb2a4a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -46,7 +46,6 @@ deckard:linux:amd64: - amd64 test:linux:amd64:valgrind: - image: cznic/ubuntu-valgrind:16.04 stage: test script: - PREFIX=$(pwd)/.local DEBUGGER="valgrind --error-exitcode=1 --leak-check=full --trace-children=yes --quiet" make -k check diff --git a/ci/Dockerfile b/ci/Dockerfile index 28d7c57ed..475b2f60d 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -9,5 +9,8 @@ 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 +RUN pip3 install --upgrade pip +RUN pip3 install --user dnspython python-augeas 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 diff --git a/ci/valgrind/Dockerfile b/ci/valgrind/Dockerfile deleted file mode 100644 index 79e13bd17..000000000 --- a/ci/valgrind/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM cznic/ubuntu:16.04 -MAINTAINER Knot DNS - -WORKDIR /root -CMD ["/bin/bash"] - -# name: cznic/ubuntu-valgrind:16.04 -# run ci tests with valgrind memory checks -RUN apt-get update -RUN apt-get upgrade -y -RUN apt-get install -y valgrind -- 2.47.3