From ef9b15fc50a74281dd8ab352ec5225d47522d548 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Wed, 22 Feb 2023 11:38:45 +0100
Subject: [PATCH 1/2] Do not set TEST_PARALLEL_JOBS in FreeBSD system test

Setting TEST_PARALLEL_JOBS to 4 in FreeBSD system test jobs is a no-op
because it's already set to 4, one level above, on the global level.

(cherry picked from commit cf46addf514238e9ac0d96e66300cc3f2e6bb0c4)
---
 .gitlab-ci.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b208bf06b..255fdc289d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1172,7 +1172,6 @@ system:clang:freebsd12:amd64:
   <<: *system_test_job
   variables:
     USER: gitlab-runner
-    TEST_PARALLEL_JOBS: 4
   needs:
     - job: clang:freebsd12:amd64
       artifacts: true
@@ -1199,7 +1198,6 @@ system:clang:freebsd13:amd64:
   <<: *system_test_job
   variables:
     USER: gitlab-runner
-    TEST_PARALLEL_JOBS: 4
   needs:
     - job: clang:freebsd13:amd64
       artifacts: true

From 5f21f3203d7abcc02201d276c4e43fe52f2ce070 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Wed, 22 Feb 2023 11:42:36 +0100
Subject: [PATCH 2/2] Disable OpenBSD system test parallelism in CI

Make OpenBSD system tests more stable by disabling parallelism in CI.

Accordingly, they will run 3-4 times longer.

(cherry picked from commit d73eba57bd03dce575f4cf4e42c80e1bced08bed)
---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 255fdc289d..bf3d0694ed 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1225,9 +1225,11 @@ system:clang:openbsd:amd64:
   <<: *api_schedules_triggers_web_triggering_rules
   variables:
     USER: gitlab-runner
+    TEST_PARALLEL_JOBS: 1
   needs:
     - job: clang:openbsd:amd64
       artifacts: true
+  timeout: 2h
 
 unit:clang:openbsd:amd64:
   <<: *openbsd_amd64_image