mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-29 13:38:26 +00:00
Code Issues Releases Wiki Activity

SoftHSM 2.4.0 only supports softhsm2.conf now, rewrite GitLab CI commands to properly support that

Browse Source
This commit is contained in:
Ondřej Surý 2018-08-13 11:24:36 +02:00
parent 2cd0a493ae
commit 6bc771828c
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@ -4,6 +4,7 @@ variables:
DOCKER_DRIVER: overlay2
CI_REGISTRY_IMAGE: registry.gitlab.isc.org/isc-projects/images/bind9
CCACHE_DIR: "/ccache"
SOFTHSM2_CONF: "/var/tmp/softhsm2/softhsm2.conf"
stages:
- precheck
@ -125,9 +126,7 @@ stages:
before_script:
- rm -rf .ccache
- bash -x bin/tests/system/ifconfig.sh up
- export SOFTHSM_CONF="/tmp/softhsm.conf"
- echo "0:/tmp/softhsm.db" > $SOFTHSM_CONF
- if command -v softhsm2-util >/dev/null; then softhsm2-util --init-token --free --pin 0000 --so-pin 0000 --label "softhsm"; fi
- bash -x util/prepare-softhsm2.sh
script:
- ( cd bin/tests && make -j${TEST_PARALLEL_JOBS:-1} -k test V=1 )
- test -s bin/tests/system/systests.output
@ -140,9 +139,7 @@ stages:
stage: test
before_script:
- export KYUA_RESULT="$CI_PROJECT_DIR/kyua.results"
- export SOFTHSM_CONF="/tmp/softhsm.conf"
- echo "0:/tmp/softhsm.db" > $SOFTHSM_CONF
- if command -v softhsm2-util >/dev/null; then softhsm2-util --init-token --free --pin 0000 --so-pin 0000 --label "softhsm"; fi
- bash -x util/prepare-softhsm2.sh
script:
- make unit
after_script:

1
util/copyrights
View File

@ -4271,6 +4271,7 @@
./util/nanny.pl PERL 2000,2001,2004,2007,2012,2016,2018
./util/new-func PERL 2005,2007,2012,2016,2018
./util/nt-kit SH 1999,2000,2001,2004,2007,2012,2016,2018
./util/prepare-softhsm2.sh X 2018
./util/spacewhack.pl PERL 2000,2001,2004,2007,2012,2016,2018
./util/tabify-changes SH 2004,2007,2012,2016,2018
./util/update-drafts.pl PERL 2000,2001,2004,2007,2012,2016,2018

10
util/prepare-softhsm2.sh Normal file
View File

@ -0,0 +1,10 @@
#!/bin/sh
if [ -n "${SOFTHSM2_CONF}" ] && command -v softhsm2-util >/dev/null; then
SOFTHSM2_DIR=$(dirname "$SOFTHSM2_CONF")
mkdir -p "${SOFTHSM2_DIR}/tokens"
echo "directories.tokendir = ${SOFTHSM2_DIR}/tokens" > "${SOFTHSM2_CONF}"
echo "objectstore.backend = file" >> "${SOFTHSM2_CONF}"
echo "log.level = DEBUG" >> "${SOFTHSM2_CONF}"
softhsm2-util --init-token --free --pin 0000 --so-pin 0000 --label "softhsm2";
fi
exit 0