Move --without-cmocka to Ubuntu 20.04 (Focal Fossa)

"focal" does not have kyua in its stock repositories and is a good
candidate to build BIND 9 with this ./configure option.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6093c63ff69ec204cbbfb50113b48bab499ce80b..ff80c112fcdfce8dcb0995edf1b9e12bae24267a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -834,7 +834,7 @@ gcc:focal:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -Og"
-    EXTRA_CONFIGURE: "--with-libidn2 --with-gssapi=/usr --disable-geoip"
+    EXTRA_CONFIGURE: "--with-libidn2 --with-gssapi=/usr --disable-geoip --without-cmocka"
   <<: *ubuntu_focal_amd64_image
   <<: *build_job
 
@@ -858,7 +858,7 @@ gcc:jammy:amd64:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O2"
-    EXTRA_CONFIGURE: "--with-libidn2 --disable-dnstap --with-gssapi --without-cmocka"
+    EXTRA_CONFIGURE: "--with-libidn2 --disable-dnstap --with-gssapi"
   <<: *ubuntu_jammy_amd64_image
   <<: *build_job