From: Ondřej Surý <ondrej@sury.org>
Date: Wed, 26 May 2021 14:16:00 +0000 (+0200)
Subject: Revert "Configure the system-wide TCP connection timeout on OpenBSD"
X-Git-Tag: v9.17.14~21^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0f6275ef81a529380eb1241a82ffec3020dbc72;p=thirdparty%2Fbind9.git

Revert "Configure the system-wide TCP connection timeout on OpenBSD"

This reverts commit 8ff15fc0289e7eba5862ae5aca611fa1d327dde5.
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index affa686c98c..d6a9c489fc7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -387,7 +387,6 @@ stages:
   <<: *default_triggering_rules
   stage: unit
   before_script:
-    - if [ -n "$TCP_CONNECTIONTIMEOUT" ]; then sudo sysctl 'net.inet.tcp.keepinittime=1'; fi
     - *setup_softhsm
     - *retrieve_out_of_tree_workspace
   script:
@@ -1232,8 +1231,6 @@ unit:clang:openbsd:amd64:
   <<: *unit_test_job
   variables:
     USER: gitlab-runner
-    # There's no socket option on OpenBSD, so we need to set this globally
-    TCP_CONNECTIONTIMEOUT: 1
   needs:
     - job: clang:openbsd:amd64
       artifacts: true