Embed SoftHSM version in CI job names

To indicate the SoftHSM version used in each CI job while avoiding the
need to add another token to job names, replace "pkcs11" with
"softhsm2.4" and "fedora31:amd64" with "softhsm2.6".

(cherry picked from commit c7169c4ab0123037a10b167b9ca00f230567329b)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 96f6bc523db10169a45a71c33b99902147d9fa34..eaa68a8334ee857362348401cbb1773f5c7c79dd 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1058,7 +1058,7 @@ unit:clang:buster:amd64:
 
 # Jobs for PKCS#11-enabled GCC builds on Debian "sid" (amd64)
 
-gcc:pkcs11:
+gcc:softhsm2.4:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
@@ -1066,23 +1066,23 @@ gcc:pkcs11:
   <<: *base_image
   <<: *build_job
 
-system:gcc:pkcs11:
+system:gcc:softhsm2.4:
   <<: *base_image
   <<: *system_test_job
   needs:
-    - job: gcc:pkcs11
+    - job: gcc:softhsm2.4
       artifacts: true
 
-unit:gcc:pkcs11:
+unit:gcc:softhsm2.4:
   <<: *base_image
   <<: *unit_test_job
   needs:
-    - job: gcc:pkcs11
+    - job: gcc:softhsm2.4
       artifacts: true
 
 # Jobs for PKCS#11-enabled GCC builds on Fedora 31 (amd64)
 
-gcc:fedora31:amd64:
+gcc:softhsm2.6:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON} -O1"
@@ -1090,18 +1090,18 @@ gcc:fedora31:amd64:
   <<: *fedora_31_amd64_image
   <<: *build_job
 
-system:gcc:fedora31:amd64:
+system:gcc:softhsm2.6:
   <<: *fedora_31_amd64_image
   <<: *system_test_job
   needs:
-    - job: gcc:fedora31:amd64
+    - job: gcc:softhsm2.6
       artifacts: true
 
-unit:gcc:fedora31:amd64:
+unit:gcc:softhsm2.6:
   <<: *fedora_31_amd64_image
   <<: *unit_test_job
   needs:
-    - job: gcc:fedora31:amd64
+    - job: gcc:softhsm2.6
       artifacts: true
 
 # Jobs for Clang builds on FreeBSD 11.3 (amd64)