Configure with --enable-dnstap by default

All platforms but OpenBSD have dnstap dependencies readily in their
respective repositories, and dnstap thus can be tested there. Given that
majority of images have dnstap dependencies available, it seems fitting
to make dnstap enabled by default.

Also dnstap is disabled for TSAN jobs configured with --disable-atomic
as it's known to produce TSAN errors (#2664) and for the gcc:noatomics
job because it has threads disabled, which is a requirement for dnstap.

(cherry picked from commit deff0ae31742795ce59c0f561fac6461fac159a8)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a081acfb28b4070bb7e12974ea9b2ed7f5e512d9..f8c53ec8202827c38f058df4a09833c72e945e80 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -223,6 +223,7 @@ stages:
     --with-geoip2=auto \
     --disable-static \
     --enable-option-checking=fatal \
+    --enable-dnstap \
     --with-cmocka \
     --with-libxml2 \
     --with-libjson \
@@ -562,7 +563,6 @@ gcc:alpine3.13:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--enable-dnstap"
   <<: *alpine_3_13_amd64_image
   <<: *build_job
 
@@ -586,7 +586,7 @@ gcc:centos6:i386:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--with-libidn2 --without-python --disable-warn-error"
+    EXTRA_CONFIGURE: "--with-libidn2 --without-python --disable-warn-error --disable-dnstap"
   <<: *centos_centos6_i386_image
   <<: *build_job
 
@@ -610,7 +610,7 @@ gcc:centos6:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--with-libidn2 --disable-warn-error"
+    EXTRA_CONFIGURE: "--with-libidn2 --disable-warn-error --disable-dnstap"
   <<: *centos_centos6_amd64_image
   <<: *build_job
 
@@ -634,7 +634,7 @@ gcc:centos7:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn2"
   <<: *centos_centos7_amd64_image
   <<: *build_job
 
@@ -707,7 +707,7 @@ gcc:buster:amd64:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} --coverage -O0"
     LDFLAGS: "--coverage"
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn2"
   <<: *debian_buster_amd64_image
   <<: *build_job
 
@@ -743,7 +743,7 @@ scan-build:
     CC: "${CLANG}"
     CFLAGS: "${CFLAGS_COMMON}"
     CONFIGURE: "${SCAN_BUILD} ./configure"
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn2"
   script:
     - *configure
     - *scan_build
@@ -763,7 +763,7 @@ gcc:sid:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O3"
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2 --without-lmdb"
+    EXTRA_CONFIGURE: "--with-libidn2 --without-lmdb"
     RUN_MAKE_INSTALL: 1
   <<: *debian_sid_amd64_image
   <<: *build_job
@@ -794,7 +794,7 @@ gcc:out-of-tree:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
     CONFIGURE: ../configure
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2 --with-lmdb"
+    EXTRA_CONFIGURE: "--with-libidn2 --with-lmdb"
     SKIP_MAKE_DEPEND: 1
     RUN_MAKE_INSTALL: 1
     OOT_BUILD_WORKSPACE: workspace
@@ -806,7 +806,7 @@ gcc:out-of-tree:
 gcc:tarball:
   variables:
     CC: gcc
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn2"
     RUN_MAKE_INSTALL: 1
   <<: *base_image
   <<: *build_job
@@ -903,7 +903,7 @@ gcc:xenial:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O2"
-    EXTRA_CONFIGURE: "--without-geoip2 --with-geoip"
+    EXTRA_CONFIGURE: "--without-geoip2 --with-geoip --disable-dnstap"
   <<: *ubuntu_xenial_amd64_image
   <<: *build_job
 
@@ -1066,7 +1066,7 @@ gcc:tsan:noatomics:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0"
     LDFLAGS: "-fsanitize=thread"
-    EXTRA_CONFIGURE: "--with-libidn2 --disable-atomic"
+    EXTRA_CONFIGURE: "--with-libidn2 --disable-atomic --disable-dnstap"
 
 system:gcc:tsan:noatomics:
   variables:
@@ -1093,7 +1093,7 @@ clang:tsan:noatomics:
     CC: "${CLANG}"
     CFLAGS: "${CFLAGS_COMMON} -fsanitize=thread -DISC_MEM_USE_INTERNAL_MALLOC=0"
     LDFLAGS: "-fsanitize=thread"
-    EXTRA_CONFIGURE: "--with-libidn2 --disable-atomic"
+    EXTRA_CONFIGURE: "--with-libidn2 --disable-atomic --disable-dnstap"
 
 system:clang:tsan:noatomics:
   variables:
@@ -1118,7 +1118,7 @@ unit:clang:tsan:noatomics:
 gcc:noatomics:
   variables:
     CC: gcc
-    EXTRA_CONFIGURE: "--disable-atomic --disable-threads"
+    EXTRA_CONFIGURE: "--disable-atomic --disable-threads --disable-dnstap"
   <<: *base_image
   <<: *build_job
 
@@ -1215,7 +1215,6 @@ unit:clang:freebsd11:amd64:
 clang:freebsd12:amd64:
   variables:
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--enable-dnstap"
     USER: gitlab-runner
   <<: *freebsd_12_amd64_image
   <<: *build_job
@@ -1243,6 +1242,7 @@ clang:openbsd:amd64:
   variables:
     CC: clang
     USER: gitlab-runner
+    EXTRA_CONFIGURE: "--disable-dnstap"
   <<: *openbsd_amd64_image
   <<: *build_job
 
@@ -1398,7 +1398,7 @@ coverity:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn2"
   script:
     - *coverity_cache_prep
     - *configure
@@ -1575,7 +1575,7 @@ abi-check:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
-    EXTRA_CONFIGURE: "--enable-dnstap --with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn2"
     BIND_BASELINE_VERSION: v9_11_31
   script:
     - *configure