summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorLukáš Ondráček <lukas.ondracek@nic.cz>2024-07-30 17:05:47 +0200
committerLukáš Ondráček <lukas.ondracek@nic.cz>2024-07-30 17:05:47 +0200
commit6834751d0f1e943d4b0db19a86f52fe45d9a9105 (patch)
treee2a4f4b6644dceb521e29b3af804c4596e81b676 /.gitlab-ci.yml
parentdefer: fix/hide tidy/trivial_checks warnings (diff)
parentMerge branch 'manager-tls-session-ticket-secret' into 'master' (diff)
downloadknot-resolver-6834751d0f1e943d4b0db19a86f52fe45d9a9105.tar.xz
knot-resolver-6834751d0f1e943d4b0db19a86f52fe45d9a9105.zip
Merge branch 'master' into rrl-wip
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml68
1 files changed, 29 insertions, 39 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2395ebb0..8531e5cc 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.1'
+ KNOT_VERSION: '3.3'
LIBKRES_ABI: 9
LIBKRES_NAME: libkres
MESON_TEST: meson test -C build_ci* -t 4 --print-errorlogs
@@ -20,7 +20,7 @@ variables:
# IMAGE_TAG is a Git branch/tag name from https://gitlab.nic.cz/knot/knot-resolver-ci
# In general, keep it pointing to a tag - use a branch only for development.
# More info in the knot-resolver-ci repository.
- IMAGE_TAG: 'v20240604'
+ IMAGE_TAG: 'v20240606'
IMAGE_PREFIX: '$CI_REGISTRY/knot/knot-resolver-ci'
image: $IMAGE_PREFIX/debian12-knot_3_3:$IMAGE_TAG
@@ -135,32 +135,18 @@ build-stable:
- ninja -C build_ci_stable install >/dev/null
- ${MESON_TEST} --suite unit --suite config --suite dnstap --no-suite snowflake
-build-deb11-knot31:
- <<: *build
- image: $IMAGE_PREFIX/debian11-knot_3_1:$IMAGE_TAG
- script:
- - meson build_ci_deb11_knot31 --prefix=$PREFIX -Dmalloc=disabled -Dwerror=true -Dextra_tests=enabled
- - ninja -C build_ci_deb11_knot31
- - ninja -C build_ci_deb11_knot31 install >/dev/null
- - ${MESON_TEST} --suite unit --suite config --suite dnstap --no-suite snowflake
-
-build-deb11-knot32:
- <<: *build
- image: $IMAGE_PREFIX/debian11-knot_3_2:$IMAGE_TAG
- script:
- - meson build_ci_deb11_knot32 --prefix=$PREFIX -Dmalloc=disabled -Dwerror=true -Dextra_tests=enabled
- - ninja -C build_ci_deb11_knot32
- - ninja -C build_ci_deb11_knot32 install >/dev/null
- - ${MESON_TEST} --suite unit --suite config --suite dnstap --no-suite snowflake
-
-build-deb12-knot32:
- <<: *build
- image: $IMAGE_PREFIX/debian12-knot_3_2:$IMAGE_TAG
- script:
- - meson build_ci_deb12_knot32 --prefix=$PREFIX -Dmalloc=disabled -Dwerror=true -Dextra_tests=enabled
- - ninja -C build_ci_deb12_knot32
- - ninja -C build_ci_deb12_knot32 install >/dev/null
- - ${MESON_TEST} --suite unit --suite config --suite dnstap --no-suite snowflake
+# This is currently the same as stable - uncomment this once Knot 3.4 is
+# released and we are building against that, to keep sanity-checking the 3.3
+# support.
+#
+#build-deb12-knot33:
+# <<: *build
+# image: $IMAGE_PREFIX/debian12-knot_3_3:$IMAGE_TAG
+# script:
+# - meson build_ci_deb12_knot33 --prefix=$PREFIX -Dmalloc=disabled -Dwerror=true -Dextra_tests=enabled
+# - ninja -C build_ci_deb12_knot33
+# - ninja -C build_ci_deb12_knot33 install >/dev/null
+# - ${MESON_TEST} --suite unit --suite config --suite dnstap --no-suite snowflake
build-deb12-knot-master:
<<: *build
@@ -309,12 +295,9 @@ lint:coverity:
- ninja -C build_ci_lib daemon/kresd
- ninja -C build_ci_lib kres-gen
- git diff --quiet || (git diff; exit 1)
-kres-gen-31:
+kres-gen-33:
<<: *kres-gen
- image: $IMAGE_PREFIX/debian11-knot_3_1:$IMAGE_TAG
-kres-gen-32:
- <<: *kres-gen
- image: $IMAGE_PREFIX/debian12-knot_3_2:$IMAGE_TAG
+ image: $IMAGE_PREFIX/debian12-knot_3_3:$IMAGE_TAG
root.hints:
<<: *sanity
@@ -623,7 +606,7 @@ obs:odvr:
.enable_repo_build: &enable_repo_build
before_script:
- - ./scripts/enable-repo.py build
+ - ./scripts/enable-repo-cznic-labs.sh knot-dns
.pkg_test: &pkg_test
stage: pkg
@@ -637,6 +620,10 @@ obs:odvr:
- apkg info cache | grep archive/dev
- apkg install --build-dep
- apkg test --test-dep
+ artifacts:
+ expire_in: 1 week
+ paths:
+ - pkg/pkgs/
.pkg_test_user: &pkg_test_user
<<: *pkg_test
@@ -661,7 +648,7 @@ pkg:make-archive:
# archive is created once and reused in other pkg jobs
<<: *pkg_deb_extras
stage: pkg
- image: $CI_REGISTRY/packaging/apkg/full/debian-11
+ image: $CI_REGISTRY/packaging/apkg/full/ubuntu-24.04
tags:
- lxc
- amd64
@@ -675,10 +662,12 @@ pkg:make-archive:
pkg:debian-12:
<<: *pkg_test_deb
+ <<: *enable_repo_build
image: $CI_REGISTRY/packaging/apkg/full/debian-12
pkg:debian-11:
<<: *pkg_test_deb
+ <<: *enable_repo_build
image: $CI_REGISTRY/packaging/apkg/full/debian-11
pkg:ubuntu-24.04:
@@ -687,6 +676,7 @@ pkg:ubuntu-24.04:
pkg:ubuntu-22.04:
<<: *pkg_test_deb
+ <<: *enable_repo_build
image: $CI_REGISTRY/packaging/apkg/full/ubuntu-22.04
pkg:ubuntu-20.04:
@@ -694,13 +684,13 @@ pkg:ubuntu-20.04:
<<: *enable_repo_build
image: $CI_REGISTRY/packaging/apkg/full/ubuntu-20.04
-pkg:fedora-39:
+pkg:fedora-40:
<<: *pkg_test
- image: $CI_REGISTRY/packaging/apkg/full/fedora-39
+ image: $CI_REGISTRY/packaging/apkg/full/fedora-40
-pkg:fedora-38:
+pkg:fedora-39:
<<: *pkg_test
- image: $CI_REGISTRY/packaging/apkg/full/fedora-38
+ image: $CI_REGISTRY/packaging/apkg/full/fedora-39
pkg:alma-9:
<<: *pkg_test