From 4c68b56246608383fe8acf27c2cc71fb4754ffb0 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.
---
 .gitlab-ci.yml | 16 ++++++++--------
 PLATFORMS      |  2 +-
 PLATFORMS.md   |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1ad8a05830..99d5fdb768 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1099,28 +1099,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)
 
diff --git a/PLATFORMS b/PLATFORMS
index dcba525030..dd00403a30 100644
--- a/PLATFORMS
+++ b/PLATFORMS
@@ -41,7 +41,7 @@ following systems:
   * Ubuntu LTS 16.04, 18.04
   * Fedora 31
   * Red Hat Enterprise Linux / CentOS 7, 8
-  * FreeBSD 11.3, 12.0
+  * FreeBSD 11.3, 12.1
   * OpenBSD 6.6
   * Alpine Linux
 
diff --git a/PLATFORMS.md b/PLATFORMS.md
index 812939f647..66d0474718 100644
--- a/PLATFORMS.md
+++ b/PLATFORMS.md
@@ -49,7 +49,7 @@ following systems:
 * Ubuntu LTS 16.04, 18.04
 * Fedora 31
 * Red Hat Enterprise Linux / CentOS 7, 8
-* FreeBSD 11.3, 12.0
+* FreeBSD 11.3, 12.1
 * OpenBSD 6.6
 * Alpine Linux
 

From 80618b53782f9bdd105b05f17496c86938a6657f 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.
---
 .gitlab-ci.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99d5fdb768..406dc9b969 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -47,7 +47,7 @@ stages:
 
 .freebsd-amd64: &freebsd_amd64
   tags:
-    - freebsd
+    - libvirt
     - amd64
 
 .linux-amd64: &linux_amd64
@@ -1082,12 +1082,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"]
@@ -1095,6 +1099,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"]
@@ -1105,12 +1111,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"]
@@ -1118,6 +1128,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"]