Run gcc:pkcs11 CI jobs on Fedora image

SoftHSM v2.4 was dropped from the base image because it is being
upgraded to Debian Bullseye, which has SoftHSM v2.6, the same version we
already have in the Fedora image, and use it in the "main" branch for
PKCS#11 testing. However, on the "v9_11" branch, to sustain PKCS#11
testing, gcc:pkcs11 CI jobs need to be ported from the base image to the
Fedora image.

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a91d1d671db87f651de7b79bb9f639afb0474f4a..2e417e22a1ed803968f001dd3525a80f2d77b89a 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1192,25 +1192,25 @@ unit:clang:buster:amd64:
     - job: clang:buster:amd64
       artifacts: true
 
-# Jobs for PKCS#11-enabled GCC builds on Debian Sid (amd64)
+# Jobs for PKCS#11-enabled GCC builds on Fedora 34 (amd64)
 
 gcc:pkcs11:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--enable-native-pkcs11 --with-pkcs11=/usr/lib/softhsm/libsofthsm2.so"
-  <<: *base_image
+    EXTRA_CONFIGURE: "--enable-native-pkcs11 --with-pkcs11=/usr/lib64/pkcs11/libsofthsm2.so"
+  <<: *fedora_34_amd64_image
   <<: *build_job
 
 system:gcc:pkcs11:
-  <<: *base_image
+  <<: *fedora_34_amd64_image
   <<: *system_test_job
   needs:
     - job: gcc:pkcs11
       artifacts: true
 
 unit:gcc:pkcs11:
-  <<: *base_image
+  <<: *fedora_34_amd64_image
   <<: *unit_test_job
   needs:
     - job: gcc:pkcs11