Use "image" key in QEMU-based CI job templates

Our GitLab Runner Custom executor scripts now use the "image" key
instead of the job name for determining the QCOW2 image to use for a
given CI job.  Update .gitlab-ci.yml to reflect that change.

(cherry picked from commit 72201badf0c6c57d1a5632a47bfb8f789182a760)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcea3c38e0ee20c26fb56e9deebb6540ee4ac194..69a1afdd70529b2f2d0fe03e1ffb4a7ecdd958ea 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,9 +42,7 @@ stages:
 
 ### Runner Tag Templates
 
-# Note: BSD runners extract the operating system version to use from job name
-
-.freebsd-amd64: &freebsd_amd64
+.libvirt-amd64: &libvirt_amd64
   tags:
     - libvirt
     - amd64
@@ -64,11 +62,6 @@ stages:
     - linux
     - i386
 
-.openbsd-amd64: &openbsd_amd64
-  tags:
-    - libvirt
-    - amd64
-
 ### Docker Image Templates
 
 # Alpine Linux
@@ -141,6 +134,20 @@ stages:
 .base: &base_image
   <<: *debian_buster_amd64_image
 
+### QCOW2 Image Templates
+
+.freebsd-11-amd64: &freebsd_11_amd64_image
+  image: "freebsd-11.4-x86_64"
+  <<: *libvirt_amd64
+
+.freebsd-12-amd64: &freebsd_12_amd64_image
+  image: "freebsd-12.1-x86_64"
+  <<: *libvirt_amd64
+
+.openbsd-amd64: &openbsd_amd64_image
+  image: "openbsd-6.7-x86_64"
+  <<: *libvirt_amd64
+
 ### Job Templates
 
 .default-triggering-rules: &default_triggering_rules
@@ -1093,75 +1100,75 @@ unit:gcc:pkcs11:
     - job: gcc:pkcs11
       artifacts: true
 
-# Jobs for Clang builds on FreeBSD 11.4 (amd64)
+# Jobs for Clang builds on FreeBSD 11 (amd64)
 
-clang:freebsd11.4:amd64:
+clang:freebsd11:amd64:
   variables:
     CFLAGS: "${CFLAGS_COMMON}"
     USER: gitlab-runner
-  <<: *freebsd_amd64
+  <<: *freebsd_11_amd64_image
   <<: *build_job
 
-system:clang:freebsd11.4:amd64:
-  <<: *freebsd_amd64
+system:clang:freebsd11:amd64:
+  <<: *freebsd_11_amd64_image
   <<: *system_test_job
   variables:
     USER: gitlab-runner
     TEST_PARALLEL_JOBS: 4
   needs:
-    - job: clang:freebsd11.4:amd64
+    - job: clang:freebsd11:amd64
       artifacts: true
 
-unit:clang:freebsd11.4:amd64:
-  <<: *freebsd_amd64
+unit:clang:freebsd11:amd64:
+  <<: *freebsd_11_amd64_image
   <<: *unit_test_job
   needs:
-    - job: clang:freebsd11.4:amd64
+    - job: clang:freebsd11:amd64
       artifacts: true
 
-# Jobs for Clang builds on FreeBSD 12.1 (amd64)
+# Jobs for Clang builds on FreeBSD 12 (amd64)
 
-clang:freebsd12.1:amd64:
+clang:freebsd12:amd64:
   variables:
     CFLAGS: "${CFLAGS_COMMON}"
     EXTRA_CONFIGURE: "--enable-dnstap"
     USER: gitlab-runner
-  <<: *freebsd_amd64
+  <<: *freebsd_12_amd64_image
   <<: *build_job
 
-system:clang:freebsd12.1:amd64:
-  <<: *freebsd_amd64
+system:clang:freebsd12:amd64:
+  <<: *freebsd_12_amd64_image
   <<: *system_test_job
   variables:
     USER: gitlab-runner
     TEST_PARALLEL_JOBS: 4
   needs:
-    - job: clang:freebsd12.1:amd64
+    - job: clang:freebsd12:amd64
       artifacts: true
 
-unit:clang:freebsd12.1:amd64:
-  <<: *freebsd_amd64
+unit:clang:freebsd12:amd64:
+  <<: *freebsd_12_amd64_image
   <<: *unit_test_job
   needs:
-    - job: clang:freebsd12.1:amd64
+    - job: clang:freebsd12:amd64
       artifacts: true
 
-# Jobs for Clang builds on OpenBSD 6.7 (amd64)
+# Jobs for Clang builds on OpenBSD (amd64)
 
-clang:openbsd6.7:amd64:
+clang:openbsd:amd64:
   variables:
     CC: clang
     USER: gitlab-runner
-  <<: *openbsd_amd64
+  <<: *openbsd_amd64_image
   <<: *build_job
 
-system:clang:openbsd6.7:amd64:
-  <<: *openbsd_amd64
+system:clang:openbsd:amd64:
+  <<: *openbsd_amd64_image
   <<: *system_test_job
   variables:
     USER: gitlab-runner
   needs:
-    - job: clang:openbsd6.7:amd64
+    - job: clang:openbsd:amd64
       artifacts: true
   only:
     - schedules