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.

(cherry picked from commit 3ecb202ba3b5f2cba2d4ec3ed0e415e3481a7e13)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2449a2269654a53e33b0ae7e4a675fcf9a461ef..96f6bc523db10169a45a71c33b99902147d9fa34 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -848,30 +848,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:
@@ -1104,6 +1080,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: