From: Tomas Krizek <tomas.krizek@nic.cz>
Date: Fri, 18 Jan 2019 14:00:40 +0000 (+0100)
Subject: gitlabci: use variable for Knot DNS version
X-Git-Tag: v4.0.0~47^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a0244010f6f7588ec0c03563e38f0c59cbcda32e;p=thirdparty%2Fknot-resolver.git

gitlabci: use variable for Knot DNS version
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ae4ac0b0a..c715aa349 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,3 @@
-image: $CI_REGISTRY/knot/knot-resolver/ci/debian-stable:knot-2.7
-
 variables:
   DEBIAN_FRONTEND: noninteractive
   LC_ALL: C.UTF-8
@@ -11,6 +9,9 @@ variables:
   RESPDIFF_COUNT: 1
   RESPDIFF_FORCE: 0
   RESPERF_FORCE: 0
+  KNOT_VERSION: 2.7
+
+image: $CI_REGISTRY/knot/knot-resolver/ci/debian-stable:knot-$KNOT_VERSION
 
 stages:
   - build
@@ -52,7 +53,7 @@ lint:pedantic:
   dependencies: []  # do not download build artifacts
   except:
     - master
-  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-2.7  # newer Debian for newer compilers
+  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-$KNOT_VERSION  # newer Debian for newer compilers
   variables:
     CFLAGS: -Werror -Wall -Wpedantic -ggdb -std=gnu11
   script:
@@ -97,7 +98,7 @@ lint:c:
   stage: test
   except:
     - master
-  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-2.7  # newer Debian for newer Clang
+  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-$KNOT_VERSION  # newer Debian for newer Clang
   dependencies: []  # do not download build artifacts
   script:
     - make lint-c CLANG_TIDY="clang-tidy -quiet"
@@ -108,7 +109,7 @@ lint:clang-scan-build:
   stage: test
   except:
     - master
-  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-2.7  # newer Debian for newer Clang
+  image: $CI_REGISTRY/knot/knot-resolver/ci/debian-unstable:knot-$KNOT_VERSION  # newer Debian for newer Clang
   dependencies: []  # do not download build artifacts
   script:
     - MAKEFLAGS="-k -j$(nproc)" SCAN_BUILD="scan-build -o scan-results --status-bugs -no-failure-reports" ./tests/clang_scan_build.sh make || true