diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 06a4c810c3..2090622e6c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -216,16 +216,16 @@ stages: # Fedora -.tsan-fedora-41-amd64: &tsan_fedora_41_amd64_image - image: "$CI_REGISTRY_IMAGE:tsan-fedora-41-amd64" +.tsan-fedora-42-amd64: &tsan_fedora_42_amd64_image + image: "$CI_REGISTRY_IMAGE:tsan-fedora-42-amd64" <<: *linux_amd64 -.fedora-41-amd64: &fedora_41_amd64_image - image: "$CI_REGISTRY_IMAGE:fedora-41-amd64" +.fedora-42-amd64: &fedora_42_amd64_image + image: "$CI_REGISTRY_IMAGE:fedora-42-amd64" <<: *linux_amd64 -.fedora-41-arm64: &fedora_41_arm64_image - image: "$CI_REGISTRY_IMAGE:fedora-41-arm64" +.fedora-42-arm64: &fedora_42_arm64_image + image: "$CI_REGISTRY_IMAGE:fedora-42-arm64" <<: *linux_arm64 # Ubuntu @@ -1272,7 +1272,7 @@ unit:gcc:noble:amd64: - job: gcc:noble:amd64 artifacts: true -# Jobs for ASAN builds on Fedora 41 (amd64) +# Jobs for ASAN builds on Fedora 42 (amd64) gcc:asan: variables: @@ -1280,20 +1280,20 @@ gcc:asan: CFLAGS: "${CFLAGS_COMMON} -fsanitize=address,undefined" LDFLAGS: "-fsanitize=address,undefined" EXTRA_CONFIGURE: "--with-libidn2 --without-jemalloc" - <<: *fedora_41_amd64_image + <<: *fedora_42_amd64_image <<: *build_job system:gcc:asan: variables: LSAN_OPTIONS: "suppressions=$CI_PROJECT_DIR/suppr-lsan.txt" - <<: *fedora_41_amd64_image + <<: *fedora_42_amd64_image <<: *system_test_job needs: - job: gcc:asan artifacts: true unit:gcc:asan: - <<: *fedora_41_amd64_image + <<: *fedora_42_amd64_image <<: *unit_test_job needs: - job: gcc:asan @@ -1324,7 +1324,7 @@ unit:clang:asan: - job: clang:asan artifacts: true -# Jobs for TSAN builds on Fedora 41 (amd64) +# Jobs for TSAN builds on Fedora 42 (amd64) gcc:tsan: variables: @@ -1332,13 +1332,13 @@ gcc:tsan: CFLAGS: "${CFLAGS_COMMON} -Wno-stringop-overread -ggdb -O2 -fsanitize=thread" LDFLAGS: "-fsanitize=thread -Wl,--disable-new-dtags" EXTRA_CONFIGURE: "--with-libidn2 --enable-pthread-rwlock --without-jemalloc PKG_CONFIG_PATH=/opt/tsan/lib/pkgconfig" - <<: *tsan_fedora_41_amd64_image + <<: *tsan_fedora_42_amd64_image <<: *build_job system:gcc:tsan: variables: TSAN_OPTIONS: "${TSAN_OPTIONS_FEDORA}" - <<: *tsan_fedora_41_amd64_image + <<: *tsan_fedora_42_amd64_image <<: *system_test_tsan_job needs: - job: gcc:tsan @@ -1347,7 +1347,7 @@ system:gcc:tsan: unit:gcc:tsan: variables: TSAN_OPTIONS: "${TSAN_OPTIONS_FEDORA}" - <<: *tsan_fedora_41_amd64_image + <<: *tsan_fedora_42_amd64_image <<: *unit_test_tsan_job needs: - job: gcc:tsan diff --git a/doc/arm/platforms.inc.rst b/doc/arm/platforms.inc.rst index 9a9f173046..03ce969462 100644 --- a/doc/arm/platforms.inc.rst +++ b/doc/arm/platforms.inc.rst @@ -45,7 +45,7 @@ following systems: - Debian 12 - Ubuntu LTS 20.04, 22.04, 24.04 -- Fedora 41 +- Fedora 42 - Red Hat Enterprise Linux / CentOS / Oracle Linux 8, 9 - FreeBSD 13.4, 14.2 - Alpine Linux 3.21 diff --git a/util/generate-stress-test-configs.py b/util/generate-stress-test-configs.py index 98d324f088..06a7a57546 100755 --- a/util/generate-stress-test-configs.py +++ b/util/generate-stress-test-configs.py @@ -47,8 +47,8 @@ else: ALL_MODES = "recursive", "authoritative", "rpz" ALL_PROTOCOLS = "tcp", "doh", "dot" ALL_PLATFORMS = ( - ".fedora-41-amd64", - ".fedora-41-arm64", + ".fedora-42-amd64", + ".fedora-42-arm64", ".freebsd-autoscaler-13-amd64-tags", )