]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Move PKCS11 CI job to Debian "bullseye"
authorMichal Nowak <mnowak@isc.org>
Thu, 15 Feb 2024 10:04:55 +0000 (11:04 +0100)
committerMichal Nowak <mnowak@isc.org>
Fri, 16 Feb 2024 10:08:32 +0000 (11:08 +0100)
Fedora images lost PKCS11 tools a long time ago, Debian "bullseye"
retains them.

.gitlab-ci.yml

index 3748ba8a6c65f19e2850168de23bfdc6224e3468..7f15d7ab299babf06d777e19ed7f439627ca85fd 100644 (file)
@@ -1137,7 +1137,7 @@ unit:clang:bullseye:amd64:
     - job: clang:bullseye:amd64
       artifacts: true
 
-# Jobs for PKCS#11-enabled GCC builds on Fedora 35 (amd64)
+# Jobs for PKCS#11-enabled GCC builds on Debian "bullseye" (amd64)
 
 # "--disable-warn-error" ./configure option disables compiler warnings. This
 # ensures that the job will not fail because of warnings (e.g., array
@@ -1147,19 +1147,19 @@ gcc:pkcs11:
   variables:
     CC: gcc
     CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--enable-native-pkcs11 --with-pkcs11=/usr/lib64/pkcs11/libsofthsm2.so --disable-warn-error"
-  <<: *fedora_35_amd64_image
+    EXTRA_CONFIGURE: "--enable-native-pkcs11 --with-pkcs11=/usr/lib/softhsm/libsofthsm2.so --disable-warn-error"
+  <<: *debian_bullseye_amd64_image
   <<: *build_job
 
 system:gcc:pkcs11:
-  <<: *fedora_35_amd64_image
+  <<: *debian_bullseye_amd64_image
   <<: *system_test_job
   needs:
     - job: gcc:pkcs11
       artifacts: true
 
 unit:gcc:pkcs11:
-  <<: *fedora_35_amd64_image
+  <<: *debian_bullseye_amd64_image
   <<: *unit_test_job
   needs:
     - job: gcc:pkcs11