diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a91d1d671d..be773af7a4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -905,30 +905,6 @@ unit:gcc:tumbleweed:amd64: - job: gcc:tumbleweed:amd64 artifacts: true -# Jobs for regular GCC builds on Fedora 34 (amd64) - -gcc:fedora34:amd64: - variables: - CC: gcc - CFLAGS: "${CFLAGS_COMMON} -O1" - EXTRA_CONFIGURE: "--with-libidn2" - <<: *fedora_34_amd64_image - <<: *build_job - -system:gcc:fedora34:amd64: - <<: *fedora_34_amd64_image - <<: *system_test_job - needs: - - job: gcc:fedora34:amd64 - artifacts: true - -unit:gcc:fedora34:amd64: - <<: *fedora_34_amd64_image - <<: *unit_test_job - needs: - - job: gcc:fedora34:amd64 - artifacts: true - # Jobs for regular GCC builds on Ubuntu 18.04 Bionic Beaver (amd64) gcc:bionic:amd64: @@ -1192,25 +1168,29 @@ unit:clang:buster:amd64: - job: clang:buster:amd64 artifacts: true -# Jobs for PKCS#11-enabled GCC builds on Debian Sid (amd64) +# Jobs for PKCS#11-enabled GCC builds on Fedora 34 (amd64) +# "--disable-warn-error" ./configure option disables compiler warnings. This +# ensures that the job will not fail because of warnings (e.g., array +# inconsistencies in lib/isc/sha2.c) we don't want to fix on BIND 9.11 because +# the version is in security-fixes-only mode. gcc:pkcs11: variables: CC: gcc CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "--enable-native-pkcs11 --with-pkcs11=/usr/lib/softhsm/libsofthsm2.so" - <<: *base_image + EXTRA_CONFIGURE: "--enable-native-pkcs11 --with-pkcs11=/usr/lib64/pkcs11/libsofthsm2.so --disable-warn-error" + <<: *fedora_34_amd64_image <<: *build_job system:gcc:pkcs11: - <<: *base_image + <<: *fedora_34_amd64_image <<: *system_test_job needs: - job: gcc:pkcs11 artifacts: true unit:gcc:pkcs11: - <<: *base_image + <<: *fedora_34_amd64_image <<: *unit_test_job needs: - job: gcc:pkcs11