From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Tue, 26 Oct 2021 14:02:25 +0000 (+0200)
Subject: ci: use Knot 3.1
X-Git-Tag: v5.4.3~16^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4348a398254bdd67b384cd8a577333b004c11c8;p=thirdparty%2Fknot-resolver.git

ci: use Knot 3.1
---

diff --git a/.github/workflows/macOS.yaml b/.github/workflows/macOS.yaml
index 73c37e386..a5ab6fc38 100644
--- a/.github/workflows/macOS.yaml
+++ b/.github/workflows/macOS.yaml
@@ -19,7 +19,7 @@ jobs:
 
       - name: Install libknot from sources
         env:
-          KNOT_DNS_VERSION: '3.0'
+          KNOT_DNS_VERSION: '3.1'
         run: |
           git clone -b ${KNOT_DNS_VERSION} https://gitlab.nic.cz/knot/knot-dns.git
           cd knot-dns
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6a668a477..72abdc401 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: '3.0'
+  KNOT_VERSION: '3.1'
   LIBKRES_ABI: 9
   LIBKRES_NAME: libkres
   MESON_TEST: meson test -C build_ci* -t 4 --print-errorlogs
@@ -261,11 +261,12 @@ lint:tidy:
     - ninja -C build_ci_lib daemon/kresd
     - ninja -C build_ci_lib kres-gen
     - git diff --quiet || (git diff; exit 1)
-kres-gen-default:
+kres-gen-30:
   <<: *kres-gen
-kres-gen-master:
+  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-11:knot-3.0
+kres-gen-31:
   <<: *kres-gen
-  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-11:knot-master
+  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-11:knot-3.1
 
 root.hints:
   <<: *sanity
diff --git a/ci/debian-11/Dockerfile b/ci/debian-11/Dockerfile
index 5f2a51131..672beb266 100644
--- a/ci/debian-11/Dockerfile
+++ b/ci/debian-11/Dockerfile
@@ -3,7 +3,7 @@
 FROM debian:bullseye
 MAINTAINER Knot Resolver <knot-resolver@labs.nic.cz>
 # >= 3.0 needed because of --enable-xdp=yes
-ARG KNOT_BRANCH=3.0
+ARG KNOT_BRANCH=3.1
 ENV DEBIAN_FRONTEND=noninteractive
 
 WORKDIR /root