From: Ondřej Surý <ondrej@sury.org>
Date: Tue, 7 Sep 2021 19:54:48 +0000 (+0200)
Subject: Disable softhsm2.4 and softhsm2.6 builds and tests from the CI
X-Git-Tag: v9.17.19~45^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=b687c1d3af7e37d353567dee76bb9a23eea16dba;p=thirdparty%2Fbind9.git

Disable softhsm2.4 and softhsm2.6 builds and tests from the CI

Until we have a system test that would directly test the engine_pkcs11
integration, we need to disable the system tests that enabled native
PKCS#11 in the CI because it's currently broken.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 57a20eea725..df82009d5b5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1024,54 +1024,6 @@ unit:clang:buster:amd64:
     - job: clang:buster:amd64
       artifacts: true
 
-# Jobs for PKCS#11-enabled GCC builds on Debian "sid" (amd64)
-
-gcc:softhsm2.4:
-  variables:
-    CC: gcc
-    CFLAGS: "${CFLAGS_COMMON}"
-    EXTRA_CONFIGURE: "--without-jemalloc --enable-native-pkcs11 --with-pkcs11=/usr/lib/softhsm/libsofthsm2.so"
-  <<: *base_image
-  <<: *build_job
-
-system:gcc:softhsm2.4:
-  <<: *base_image
-  <<: *system_test_job
-  needs:
-    - job: gcc:softhsm2.4
-      artifacts: true
-
-unit:gcc:softhsm2.4:
-  <<: *base_image
-  <<: *unit_test_job
-  needs:
-    - job: gcc:softhsm2.4
-      artifacts: true
-
-# Jobs for PKCS#11-enabled GCC builds on Fedora 34 (amd64)
-
-gcc:softhsm2.6:
-  variables:
-    CC: gcc
-    CFLAGS: "${CFLAGS_COMMON} -O1"
-    EXTRA_CONFIGURE: "--with-libidn2 --enable-native-pkcs11 --with-pkcs11=/usr/lib64/pkcs11/libsofthsm2.so"
-  <<: *fedora_34_amd64_image
-  <<: *build_job
-
-system:gcc:softhsm2.6:
-  <<: *fedora_34_amd64_image
-  <<: *system_test_job
-  needs:
-    - job: gcc:softhsm2.6
-      artifacts: true
-
-unit:gcc:softhsm2.6:
-  <<: *fedora_34_amd64_image
-  <<: *unit_test_job
-  needs:
-    - job: gcc:softhsm2.6
-      artifacts: true
-
 # Jobs for Clang builds on FreeBSD 11 (amd64)
 
 clang:freebsd11:amd64: