From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Wed, 16 Oct 2019 14:03:55 +0000 (+0200)
Subject: ci: switch to Knot DNS 2.9.x
X-Git-Tag: v4.3.0~18^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e462549efb858a4a79aac2121a43af3d18089d17;p=thirdparty%2Fknot-resolver.git

ci: switch to Knot DNS 2.9.x
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f6f4b1d7..8216a5d90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -9,7 +9,7 @@ variables:
   RESPDIFF_COUNT: 1
   RESPDIFF_FORCE: 0
   RESPERF_FORCE: 0
-  KNOT_VERSION: '2.8'
+  KNOT_VERSION: '2.9'
   LIBKRES_ABI: 9
   LIBKRES_NAME: libkres
   MESON_TEST: meson test -C build_ci* -t 2 --print-errorlogs
diff --git a/.travis.yml b/.travis.yml
index 66d574933..5456c83b3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ matrix:
     fast_finish: true
 env:
     global:
-        - KNOT_DNS_VERSION=2.8
+        - KNOT_DNS_VERSION=2.9
         - MALLOC_CHECK_=3
         - MALLOC_PERTURB_=223
 before_script:
diff --git a/Dockerfile b/Dockerfile
index cf874cc7d..46af77831 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Intermediate container for Knot DNS build (not persistent)
 FROM debian:stable AS knot-dns-build
-ARG KNOT_DNS_VERSION=v2.8.4
+ARG KNOT_DNS_VERSION=v2.9.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 e67e21f23..abaeed350 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -4,7 +4,7 @@ Docker Build
 * debian-buster
 
 ```
-$ export KNOT_BRANCH=2.8
+$ export KNOT_BRANCH=2.9
 $ docker build --no-cache -t registry.labs.nic.cz/knot/knot-resolver/ci/debian-buster:knot-$KNOT_BRANCH --build-arg KNOT_BRANCH=$KNOT_BRANCH debian-buster
 
 $ docker login registry.labs.nic.cz
diff --git a/ci/debian-buster/Dockerfile b/ci/debian-buster/Dockerfile
index 690e5318e..f660563c7 100644
--- a/ci/debian-buster/Dockerfile
+++ b/ci/debian-buster/Dockerfile
@@ -1,6 +1,6 @@
 FROM debian:buster
 MAINTAINER Knot Resolver <knot-resolver@labs.nic.cz>
-ARG KNOT_BRANCH=2.8
+ARG KNOT_BRANCH=2.9
 
 WORKDIR /root
 CMD ["/bin/bash"]