From: Michał Kępień <michal@isc.org>
Date: Fri, 4 Aug 2023 10:10:49 +0000 (+0200)
Subject: Temporarily disable dnstap for OL7 builds in CI
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6696e99ea2309d0cc57045ba45500f1b0b314777;p=thirdparty%2Fbind9.git

Temporarily disable dnstap for OL7 builds in CI

The "dnstap" system test started to fail very frequently for BIND 9.16
builds running in Oracle Linux 7 Docker containers spawned by GitLab CI.
The test used to be perfectly stable on that platform for the exact same
source tree, so the problem could not have been triggered by a bad code
change.  Temporarily disable dnstap for Oracle Linux 7 builds prepared
in GitLab CI until the issue is fixed as it virtually prevents the
relevant GitLab CI jobs from being able to succeed.

See isc-projects/bind9#4240

(cherry picked from commit 8078e7de05834ed800d7b1a302f945fc74f73d23)
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d8b4d833b86..e23dd9221e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -598,7 +598,7 @@ gcc:oraclelinux7:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn2 --disable-dnstap"
   <<: *oraclelinux_7_amd64_image
   <<: *build_job