Merge branch 'mnowak/revert-05b09f2b5bb68a916288f56bf627babad4055b90-9.18' into 'bind-9.18'

[9.18] Revert "Work around a TSAN issue with newer kernels"

See merge request isc-projects/bind9!8908
This commit is contained in:
Michal Nowak 2024-03-25 14:34:42 +00:00
commit 39df68be24

View file

@ -309,7 +309,6 @@ stages:
<<: *default_triggering_rules
stage: build
before_script:
- sysctl vm.mmap_rnd_bits=28 || true # https://gitlab.isc.org/isc-projects/bind9/-/issues/4649
- test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
- test -n "${OUT_OF_TREE_WORKSPACE}" && mkdir "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
script:
@ -368,7 +367,6 @@ stages:
<<: *default_triggering_rules
stage: system
before_script:
- sysctl vm.mmap_rnd_bits=28 || true # https://gitlab.isc.org/isc-projects/bind9/-/issues/4649
- test -n "${OUT_OF_TREE_WORKSPACE}" && cp -r bin/tests/system/* "${OUT_OF_TREE_WORKSPACE}/bin/tests/system/" && cd "${OUT_OF_TREE_WORKSPACE}"
- *setup_interfaces
script:
@ -445,7 +443,6 @@ stages:
<<: *default_triggering_rules
stage: unit
before_script:
- sysctl vm.mmap_rnd_bits=28 || true # https://gitlab.isc.org/isc-projects/bind9/-/issues/4649
- test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
script:
- make -j${TEST_PARALLEL_JOBS:-1} -k unit V=1
@ -494,7 +491,6 @@ stages:
.respdiff: &respdiff_job
stage: system
before_script:
- sysctl vm.mmap_rnd_bits=28 || true # https://gitlab.isc.org/isc-projects/bind9/-/issues/4649
- autoreconf -fi
- *configure
- make -j${BUILD_PARALLEL_JOBS:-1} V=1