From cc39ce5b04ebeb76d0fba74564732392a6d8de57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Mon, 16 Mar 2020 11:32:46 +0100
Subject: [PATCH 1/2] Update GitLab CI to FreeBSD 12.1

Since FreeBSD 12.1 is the current FreeBSD 12.x release, replace FreeBSD
12.0 GitLab CI jobs with their up-to-date counterparts.

(cherry picked from commit 4c68b56246608383fe8acf27c2cc71fb4754ffb0)
---
 .gitlab-ci.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2dc3f2460c..1acb5baa84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -968,28 +968,28 @@ unit:clang:freebsd11.3:amd64:
     - clang:freebsd11.3:amd64
   needs: ["clang:freebsd11.3:amd64"]
 
-# Jobs for Clang builds on FreeBSD 12.0 (amd64)
+# Jobs for Clang builds on FreeBSD 12.1 (amd64)
 
-clang:freebsd12.0:amd64:
+clang:freebsd12.1:amd64:
   variables:
     CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--enable-dnstap"
   <<: *freebsd_amd64
   <<: *build_job
 
-system:clang:freebsd12.0:amd64:
+system:clang:freebsd12.1:amd64:
   <<: *freebsd_amd64
   <<: *system_test_job
   dependencies:
-    - clang:freebsd12.0:amd64
-  needs: ["clang:freebsd12.0:amd64"]
+    - clang:freebsd12.1:amd64
+  needs: ["clang:freebsd12.1:amd64"]
 
-unit:clang:freebsd12.0:amd64:
+unit:clang:freebsd12.1:amd64:
   <<: *freebsd_amd64
   <<: *unit_test_job
   dependencies:
-    - clang:freebsd12.0:amd64
-  needs: ["clang:freebsd12.0:amd64"]
+    - clang:freebsd12.1:amd64
+  needs: ["clang:freebsd12.1:amd64"]
 
 # Jobs for Clang builds on OpenBSD 6.6 (amd64)
 

From e81e1fc45885c4821e96ad8c98083f8fd6e5fa2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Mon, 16 Mar 2020 11:32:46 +0100
Subject: [PATCH 2/2] Move FreeBSD CI jobs to libvirt-based executors

To get rid of the currently used FreeBSD-specific executor, move FreeBSD
CI jobs to libvirt-based executors.  Make the necessary tag and variable
adjustments.

(cherry picked from commit 80618b53782f9bdd105b05f17496c86938a6657f)
---
 .gitlab-ci.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1acb5baa84..baee0919db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -43,7 +43,7 @@ stages:
 
 .freebsd-amd64: &freebsd_amd64
   tags:
-    - freebsd
+    - libvirt
     - amd64
 
 .linux-amd64: &linux_amd64
@@ -951,12 +951,16 @@ unit:pkcs11:sid:amd64:
 clang:freebsd11.3:amd64:
   variables:
     CFLAGS: "${CFLAGS_COMMON}"
+    USER: gitlab-runner
   <<: *freebsd_amd64
   <<: *build_job
 
 system:clang:freebsd11.3:amd64:
   <<: *freebsd_amd64
   <<: *system_test_job
+  variables:
+    USER: gitlab-runner
+    TEST_PARALLEL_JOBS: 4
   dependencies:
     - clang:freebsd11.3:amd64
   needs: ["clang:freebsd11.3:amd64"]
@@ -964,6 +968,8 @@ system:clang:freebsd11.3:amd64:
 unit:clang:freebsd11.3:amd64:
   <<: *freebsd_amd64
   <<: *unit_test_job
+  variables:
+    USER: gitlab-runner
   dependencies:
     - clang:freebsd11.3:amd64
   needs: ["clang:freebsd11.3:amd64"]
@@ -974,12 +980,16 @@ clang:freebsd12.1:amd64:
   variables:
     CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--enable-dnstap"
+    USER: gitlab-runner
   <<: *freebsd_amd64
   <<: *build_job
 
 system:clang:freebsd12.1:amd64:
   <<: *freebsd_amd64
   <<: *system_test_job
+  variables:
+    USER: gitlab-runner
+    TEST_PARALLEL_JOBS: 4
   dependencies:
     - clang:freebsd12.1:amd64
   needs: ["clang:freebsd12.1:amd64"]
@@ -987,6 +997,8 @@ system:clang:freebsd12.1:amd64:
 unit:clang:freebsd12.1:amd64:
   <<: *freebsd_amd64
   <<: *unit_test_job
+  variables:
+    USER: gitlab-runner
   dependencies:
     - clang:freebsd12.1:amd64
   needs: ["clang:freebsd12.1:amd64"]