From a29f98be26386b433b5e70845aa795563caa9ef0 Mon Sep 17 00:00:00 2001 From: Norbert Pocs Date: Thu, 6 Oct 2022 14:56:38 +0200 Subject: [PATCH] .gitlab-ci.yml: Run pkcs11 tests on c9s Signed-off-by: Norbert Pocs Reviewed-by: Jakub Jelen (cherry picked from commit e29ffd78b327b98edcbe5c70175233fda6959044) --- .gitlab-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb52ac42..dfc55050 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,9 +99,11 @@ centos7/openssl_1.0.x/x86_64: centos9s/openssl_3.0.x/x86_64: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$CENTOS9_BUILD extends: .tests + variables: + CMAKE_ADDITIONAL_OPTIONS: -DWITH_PKCS11_URI=ON script: - export OPENSSL_ENABLE_SHA1_SIGNATURES=1 - - cmake3 $CMAKE_OPTIONS .. && + - cmake $CMAKE_OPTIONS $CMAKE_ADDITIONAL_OPTIONS .. && make -j$(nproc) && ctest --output-on-failure @@ -110,7 +112,7 @@ centos9s/openssl_3.0.x/x86_64/fips: image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$CENTOS9_BUILD script: - export OPENSSL_ENABLE_SHA1_SIGNATURES=1 - - cmake3 $CMAKE_OPTIONS .. && + - cmake $CMAKE_OPTIONS $CMAKE_ADDITIONAL_OPTIONS .. && make -j$(nproc) && OPENSSL_FORCE_FIPS_MODE=1 ctest --output-on-failure @@ -140,7 +142,7 @@ fedora/openssl_3.0.x/x86_64/fips: extends: .fips image: $CI_REGISTRY/$BUILD_IMAGES_PROJECT:$FEDORA_BUILD script: - - cmake $CMAKE_OPTIONS .. && + - cmake $CMAKE_OPTIONS $CMAKE_ADDITIONAL_OPTIONS .. && make -j$(nproc) && OPENSSL_FORCE_FIPS_MODE=1 ctest --output-on-failure