From: Michał Kępień <michal@isc.org>
Date: Wed, 1 Sep 2021 13:46:36 +0000 (+0200)
Subject: Test various --with-gssapi options in GitLab CI
X-Git-Tag: v9.11.36~5^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d89c65118a277fa5f76178d512c455dab804417c;p=thirdparty%2Fbind9.git

Test various --with-gssapi options in GitLab CI

The implicit ./configure default is to use --with-gssapi=auto.  There is
already a GitLab CI job (gcc:stretch:amd64) which uses --without-gssapi.
Add four more forms of the --with-gssapi option to various GitLab CI job
configurations so that its every possible variant is regularly tested.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1108949d08c..26f498e7d01 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -897,7 +897,7 @@ gcc:bionic:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O2"
-    EXTRA_CONFIGURE: "--without-geoip2 --with-geoip --disable-dnstap"
+    EXTRA_CONFIGURE: "--without-geoip2 --with-geoip --disable-dnstap --with-gssapi"
   <<: *ubuntu_bionic_amd64_image
   <<: *build_job
 
@@ -921,7 +921,7 @@ gcc:focal:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
-    EXTRA_CONFIGURE: "--with-libidn2"
+    EXTRA_CONFIGURE: "--with-libidn2 --with-gssapi=/usr"
   <<: *ubuntu_focal_amd64_image
   <<: *build_job
 
@@ -1212,6 +1212,7 @@ unit:clang:freebsd11:amd64:
 clang:freebsd12:amd64:
   variables:
     CFLAGS: "${CFLAGS_COMMON}"
+    EXTRA_CONFIGURE: "--with-gssapi=krb5-config"
     USER: gitlab-runner
   <<: *freebsd_12_amd64_image
   <<: *build_job
@@ -1238,7 +1239,7 @@ unit:clang:freebsd12:amd64:
 clang:freebsd13:amd64:
   variables:
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "${WITH_READLINE_LIBEDIT}"
+    EXTRA_CONFIGURE: "${WITH_READLINE_LIBEDIT} --with-gssapi=/usr/bin/krb5-config"
     USER: gitlab-runner
   <<: *freebsd_13_amd64_image
   <<: *build_job