From: Michał Kępień <michal@isc.org>
Date: Thu, 4 Jun 2020 12:11:46 +0000 (+0200)
Subject: Make Fedora CI jobs PKCS#11-enabled
X-Git-Tag: v9.17.2~20^2~1
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=3ecb202ba3b5f2cba2d4ec3ed0e415e3481a7e13;p=thirdparty%2Fbind9.git

Make Fedora CI jobs PKCS#11-enabled

Various SoftHSM versions differ in algorithm support.  Since Fedora
tends to have the latest SoftHSM version available in its stock package
repositories, enable PKCS#11 support in Fedora jobs to test multiple
SoftHSM versions in GitLab CI.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e138cf19261..477be5ccd5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -843,30 +843,6 @@ unit:gcc:tumbleweed:amd64:
     - job: gcc:tumbleweed:amd64
       artifacts: true
 
-# Jobs for regular GCC builds on Fedora 31 (amd64)
-
-gcc:fedora31:amd64:
-  variables:
-    CC: gcc
-    CFLAGS: "${CFLAGS_COMMON} -O1"
-    EXTRA_CONFIGURE: "--with-libidn2"
-  <<: *fedora_31_amd64_image
-  <<: *build_job
-
-system:gcc:fedora31:amd64:
-  <<: *fedora_31_amd64_image
-  <<: *system_test_job
-  needs:
-    - job: gcc:fedora31:amd64
-      artifacts: true
-
-unit:gcc:fedora31:amd64:
-  <<: *fedora_31_amd64_image
-  <<: *unit_test_job
-  needs:
-    - job: gcc:fedora31:amd64
-      artifacts: true
-
 # Jobs for regular GCC builds on Ubuntu 16.04 Xenial Xerus (amd64)
 
 gcc:xenial:amd64:
@@ -1099,6 +1075,30 @@ unit:gcc:pkcs11:
     - job: gcc:pkcs11
       artifacts: true
 
+# Jobs for PKCS#11-enabled GCC builds on Fedora 31 (amd64)
+
+gcc:fedora31:amd64:
+  variables:
+    CC: gcc
+    CFLAGS: "${CFLAGS_COMMON} -O1"
+    EXTRA_CONFIGURE: "--with-libidn2 --enable-native-pkcs11 --with-pkcs11=/usr/lib64/pkcs11/libsofthsm2.so"
+  <<: *fedora_31_amd64_image
+  <<: *build_job
+
+system:gcc:fedora31:amd64:
+  <<: *fedora_31_amd64_image
+  <<: *system_test_job
+  needs:
+    - job: gcc:fedora31:amd64
+      artifacts: true
+
+unit:gcc:fedora31:amd64:
+  <<: *fedora_31_amd64_image
+  <<: *unit_test_job
+  needs:
+    - job: gcc:fedora31:amd64
+      artifacts: true
+
 # Jobs for Clang builds on FreeBSD 11.3 (amd64)
 
 clang:freebsd11.3:amd64: