From: Michał Kępień <michal@isc.org>
Date: Thu, 4 Jun 2020 12:11:46 +0000 (+0200)
Subject: Embed SoftHSM version in CI job names
X-Git-Tag: v9.17.2~20^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c7169c4ab0123037a10b167b9ca00f230567329b;p=thirdparty%2Fbind9.git

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".
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 477be5ccd5c..25d5adb5ee8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1053,7 +1053,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}"
@@ -1061,23 +1061,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"
@@ -1085,18 +1085,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)