]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Revert "Work around a TSAN issue with newer kernels"
authorMichal Nowak <mnowak@isc.org>
Thu, 21 Mar 2024 13:06:00 +0000 (14:06 +0100)
committerMichal Nowak <mnowak@isc.org>
Mon, 25 Mar 2024 14:08:12 +0000 (15:08 +0100)
This reverts commit 05b09f2b5bb68a916288f56bf627babad4055b90.

The workaround has been moved to the AMI image (isc-private/packer!10).

(cherry picked from commit aba16af556bfe142f2a3c5eb1da72713a41cf746)

.gitlab-ci.yml

index b1d23f3a4354d0f03a0ce48dd78a0d2470189371..f5bce8fb5e07f53e21d84b78dd6a49132965d87e 100644 (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