From: Lukáš Ježek <lukas.jezek@nic.cz>
Date: Mon, 14 Sep 2020 13:57:20 +0000 (+0200)
Subject: ci: use docker image with knot 3.0
X-Git-Tag: v5.2.0~34^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=712374ea42d53f5e958328138df756f9fd720b4f;p=thirdparty%2Fknot-resolver.git

ci: use docker image with knot 3.0
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1781825f2..47ab68e6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ variables:
   RESPDIFF_COUNT: 1
   RESPDIFF_FORCE: 0
   RESPERF_FORCE: 0
-  KNOT_VERSION: '2.9'
+  KNOT_VERSION: '3.0'
   LIBKRES_ABI: 9
   LIBKRES_NAME: libkres
   MESON_TEST: meson test -C build_ci* -t 4 --print-errorlogs
diff --git a/.travis.yml b/.travis.yml
index 89c592f01..1cf142d1b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,7 +23,7 @@ jobs:
     fast_finish: true
 env:
     global:
-        - KNOT_DNS_VERSION=2.9
+        - KNOT_DNS_VERSION=3.0
         - MALLOC_CHECK_=3
         - MALLOC_PERTURB_=223
 before_script:
diff --git a/Dockerfile b/Dockerfile
index 150086fcc..ef0778e0f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Intermediate container for Knot DNS build (not persistent)
 # SPDX-License-Identifier: GPL-3.0-or-later
 FROM debian:stable AS knot-dns-build
-ARG KNOT_DNS_VERSION=v2.9.0
+ARG KNOT_DNS_VERSION=v3.0.0
 
 # Build dependencies
 ENV KNOT_DNS_BUILD_DEPS git-core build-essential libtool autoconf pkg-config \
diff --git a/ci/README.md b/ci/README.md
index eb9083efc..4e9bdec76 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -4,7 +4,7 @@ Docker Build
 * debian-buster
 
 ```
-$ export KNOT_BRANCH=2.9
+$ export KNOT_BRANCH=3.0
 $ docker build --no-cache -t registry.nic.cz/knot/knot-resolver/ci/debian-buster:knot-$KNOT_BRANCH --build-arg KNOT_BRANCH=$KNOT_BRANCH debian-buster
 
 $ docker login registry.nic.cz
diff --git a/ci/debian-buster/Dockerfile b/ci/debian-buster/Dockerfile
index 0d0527f8a..131e9448b 100644
--- a/ci/debian-buster/Dockerfile
+++ b/ci/debian-buster/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM debian:buster
 MAINTAINER Knot Resolver <knot-resolver@labs.nic.cz>
-ARG KNOT_BRANCH=2.9
+ARG KNOT_BRANCH=3.0
 ENV DEBIAN_FRONTEND=noninteractive
 
 WORKDIR /root
diff --git a/tests/integration/deckard b/tests/integration/deckard
index 81e1c94e4..1e2901a9b 160000
--- a/tests/integration/deckard
+++ b/tests/integration/deckard
@@ -1 +1 @@
-Subproject commit 81e1c94e4cfe4f2e4a31ea70574a8e5278434825
+Subproject commit 1e2901a9b23858ad933b25e3ea154260e7f59361