diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7acc343558..bfd4c1f34a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -208,10 +208,6 @@ stages: ### QCOW2 Image Templates -.freebsd-12-amd64: &freebsd_12_amd64_image - image: "freebsd-12.4-x86_64" - <<: *libvirt_amd64 - .freebsd-13-amd64: &freebsd_13_amd64_image image: "freebsd-13.2-x86_64" <<: *libvirt_amd64 @@ -993,7 +989,7 @@ gcc:tumbleweed:amd64: variables: CC: gcc CFLAGS: "${CFLAGS_COMMON} -DDEBUG" - EXTRA_CONFIGURE: "--with-libidn2" + EXTRA_CONFIGURE: "--with-libidn2 --with-gssapi=krb5-config" <<: *tumbleweed_latest_amd64_image <<: *build_job @@ -1239,32 +1235,6 @@ unit:gcc:softhsm2.6: - job: gcc:softhsm2.6 artifacts: true -# Jobs for Clang builds on FreeBSD 12 (amd64) - -clang:freebsd12:amd64: - variables: - CFLAGS: "${CFLAGS_COMMON}" - EXTRA_CONFIGURE: "--with-gssapi=krb5-config" - USER: gitlab-runner - <<: *freebsd_12_amd64_image - <<: *build_job - -system:clang:freebsd12:amd64: - <<: *freebsd_12_amd64_image - <<: *system_test_job - variables: - USER: gitlab-runner - needs: - - job: clang:freebsd12:amd64 - artifacts: true - -unit:clang:freebsd12:amd64: - <<: *freebsd_12_amd64_image - <<: *unit_test_job - needs: - - job: clang:freebsd12:amd64 - artifacts: true - # Jobs for Clang builds on FreeBSD 13 (amd64) clang:freebsd13:amd64: @@ -1737,7 +1707,6 @@ stress:rpz:fedora:39:arm64: - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /linux/i && $BIND_STRESS_TEST_MODE =~ /rpz/i && $BIND_STRESS_TEST_ARCH =~ /arm64/i) stress:authoritative:freebsd12:amd64: - <<: *freebsd_12_amd64_image <<: *freebsd_stress_amd64 <<: *stress_job variables: @@ -1752,7 +1721,6 @@ stress:authoritative:freebsd12:amd64: - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /freebsd/i && $BIND_STRESS_TEST_MODE =~ /authoritative/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i) stress:recursive:freebsd12:amd64: - <<: *freebsd_12_amd64_image <<: *freebsd_stress_amd64 <<: *stress_job variables: @@ -1767,7 +1735,6 @@ stress:recursive:freebsd12:amd64: - $CI_COMMIT_TAG || ($BIND_STRESS_TEST_OS =~ /freebsd/i && $BIND_STRESS_TEST_MODE =~ /recursive/i && $BIND_STRESS_TEST_ARCH =~ /amd64/i) stress:rpz:freebsd12:amd64: - <<: *freebsd_12_amd64_image <<: *freebsd_stress_amd64 <<: *stress_job variables: diff --git a/doc/arm/platforms.rst b/doc/arm/platforms.rst index ef2949ad4c..d831e221be 100644 --- a/doc/arm/platforms.rst +++ b/doc/arm/platforms.rst @@ -49,7 +49,7 @@ following systems: - Ubuntu LTS 20.04, 22.04 - Fedora 39 - Red Hat Enterprise Linux / CentOS / Oracle Linux 7, 8, 9 -- FreeBSD 12.4, 13.2, 14.0 +- FreeBSD 13.2, 14.0 - Alpine Linux 3.19 The amd64, i386, armhf and arm64 CPU architectures are all fully