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)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9997ca2f1a49e99ed5b3f0f352b355b5a4a4ef47..5685a9d800c89fd44cd28dc6d60bf960b3e5f9d4 100644 (file)
--- 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"]