mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-01 15:05:23 +00:00
Code Issues Releases Wiki Activity

Only run pkcs11engine test if pkcs11-provider is available

Browse Source 
The bullseye and bookworm images are not set up with pkcs11-provider,
so we need to add an additional prerequisite for running the
pkcs11engine test. Check the path of OPENSSL_CONF.
This commit is contained in:
Matthijs Mekking
2023-10-10 15:21:58 +02:00
parent 62e7cc66d0
commit 2e9fd6d0c1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -946,7 +946,7 @@ gcc:ossl3:sid:amd64:
<<: *build_job <<: *build_job
system:gcc:ossl3:sid:amd64: system:gcc:ossl3:sid:amd64:
# Set up environment variables to run pkcs11-provider system tests # Set up environment variables to run pkcs11-provider based system tests
variables: variables:
OPENSSL_CONF: "/var/tmp/etc/openssl-provider.cnf" OPENSSL_CONF: "/var/tmp/etc/openssl-provider.cnf"
SOFTHSM2_CONF: "/var/tmp/softhsm2/softhsm2.conf" SOFTHSM2_CONF: "/var/tmp/softhsm2/softhsm2.conf"

5
bin/tests/system/enginepkcs11/prereq.sh
View File

@@ -13,6 +13,11 @@
. ../conf.sh . ../conf.sh
[ "prereq/var/tmp/etc/openssl-provider.cnf" -eq "prereq${OPENSSL_CONF}" ] || {
echo_i "skip: pkcs11-provider not enabled"
exit 255
}
[ -n "${SOFTHSM2_CONF}" ] || { [ -n "${SOFTHSM2_CONF}" ] || {
echo_i "skip: softhsm2 configuration not available" echo_i "skip: softhsm2 configuration not available"
exit 255 exit 255