CI: make freebsd slightly more in line with others

the combination of want_qemu and skip_container is not very straight
forward.

What we actually have, is that freebsd is only qemu based, so there is
no point in really having a `_QEMU` tag for it.

Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com>

3 files changed, 39 insertions, 27 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e1082bec..59d7606b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -95,7 +95,6 @@ variables:
   ALPINE_TAG:  '2022-06-10.0'
   FREEBSD_TAG: '2022-06-10.0'
   FEDORA_QEMU_TAG:     'fedora-qemu-vm-2022-06-10.0'
-  FREEBSD_QEMU_TAG:    'freebsd-qemu-vm-2022-06-10.0'
 
   FDO_UPSTREAM_REPO: libinput/libinput
 
@@ -211,19 +210,6 @@ fedora:36@qemu-prep:
     FDO_DISTRIBUTION_TAG: $FEDORA_QEMU_TAG
     FDO_DISTRIBUTION_PACKAGES: $FEDORA_PACKAGES
 
-freebsd:13.0@qemu-prep:
-  extends:
-    - .fdo.qemu-build@freebsd
-    - .policy
-  stage: prep
-  tags:
-    - kvm
-  variables:
-    GIT_STRATEGY: none
-    FDO_DISTRIBUTION_VERSION: "13.0"
-    FDO_DISTRIBUTION_TAG: $FREEBSD_QEMU_TAG
-    FDO_DISTRIBUTION_PACKAGES: $FREEBSD_PACKAGES
-
 
 fedora:35@container-prep:
   extends:
@@ -291,6 +277,19 @@ alpine:latest@container-prep:
     FDO_DISTRIBUTION_PACKAGES: $ALPINE_PACKAGES
     FDO_DISTRIBUTION_TAG: $ALPINE_TAG
 
+freebsd:13.0@container-prep:
+  extends:
+    - .fdo.qemu-build@freebsd
+    - .policy
+  tags:
+    - kvm
+  stage: prep
+  variables:
+    GIT_STRATEGY: none
+    FDO_DISTRIBUTION_VERSION: '13.0'
+    FDO_DISTRIBUTION_PACKAGES: $FREEBSD_PACKAGES
+    FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
+
 
 
 #################################################################
@@ -383,6 +382,16 @@ alpine:latest@container-clean:
     FDO_DISTRIBUTION_VERSION: 'latest'
     FDO_DISTRIBUTION_TAG: $ALPINE_TAG
 
+freebsd:13.0@container-clean:
+  extends:
+    - .policy
+    - .container-clean
+  variables:
+    GIT_STRATEGY: none
+    CURRENT_CONTAINER_IMAGE: $CI_REGISTRY_IMAGE/freebsd/$FDO_DISTRIBUTION_VERSION:$FDO_DISTRIBUTION_TAG
+    FDO_DISTRIBUTION_VERSION: '13.0'
+    FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
+
 
 #################################################################
 #                                                               #
@@ -964,11 +973,11 @@ freebsd:13.0@default-build:
     - .fdo.distribution-image@freebsd
   variables:
     FDO_DISTRIBUTION_VERSION: '13.0'
-    FDO_DISTRIBUTION_TAG: $FREEBSD_QEMU_TAG
+    FDO_DISTRIBUTION_TAG: $FREEBSD_TAG
     MESON_ARGS: '-Dtests=false -Ddocumentation=false' # doxygen drags down too many deps
     MESON_TEST_ARGS: '' # test suite doesn't work on BSD yet
   needs:
-    - "freebsd:13.0@qemu-prep"
+    - "freebsd:13.0@container-prep"
 
 
 #################################################################
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 9681dced..6c16d403 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -208,12 +208,19 @@ check-commit:
 {% endfor %}
 
 {% for distro in distributions %}
-{% if not distro.skip_container %}
 {% for version in distro.versions %}
 {{distro.name}}:{{version}}@container-prep:
   extends:
+{% if distro.qemu_based %}
+    - .fdo.qemu-build@{{distro.name}}
+{% else %}
     - .fdo.container-build@{{distro.name}}
+{% endif %}
     - .policy
+{% if distro.qemu_based %}
+  tags:
+    - kvm
+{% endif %}
   stage: prep
   variables:
     GIT_STRATEGY: none
@@ -222,7 +229,6 @@ check-commit:
     FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_TAG
 
 {% endfor %}
-{% endif %}
 {% endfor %}
 
 
@@ -257,7 +263,6 @@ check-commit:
     - schedules
 
 {% for distro in distributions %}
-{% if not distro.skip_container %}
 {% for version in distro.versions %}
 {{distro.name}}:{{version}}@container-clean:
   extends:
@@ -270,7 +275,6 @@ check-commit:
     FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_TAG
 
 {% endfor %}
-{% endif %}
 {% endfor %}
 
 #################################################################
@@ -366,7 +370,7 @@ check-commit:
 
 
 {# qemu tests are only done for the latest version of any distribution #}
-{% for distro in distributions if distro.want_qemu %}
+{% for distro in distributions if distro.use_for_qemu_tests %}
 {% set version = "{}".format(distro.versions|last()) %}
 {% if distro.use_for_custom_build_tests %}
 .{{distro.name}}:{{version}}@test-suite-vm:
@@ -405,7 +409,7 @@ vm-valgrind-{{suite.name}}:
 
 {% endfor %}
 {% endif %}
-{% endfor %}{# for if distro.want_qemu #}
+{% endfor %}{# for if distro.use_for_qemu_tests #}
 
 {% for distro in distributions if distro.use_for_custom_build_tests %}
 {% set version = "{}".format(distro.versions|last()) %}
@@ -612,7 +616,7 @@ coverity:
 #################################################################
 
 {% for distro in distributions %}
-{% if not distro.skip_container %}
+{% if not distro.qemu_based %}
 {% for version in distro.versions %}
 {{distro.name}}:{{version}}@default-build:
   stage: distro
@@ -642,7 +646,7 @@ coverity:
     - .fdo.distribution-image@{{distro.name}}
   variables:
     FDO_DISTRIBUTION_VERSION: '{{version}}'
-    FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_QEMU_TAG
+    FDO_DISTRIBUTION_TAG: ${{distro.name.upper()}}_TAG
     {# Where we have extra_variables defined, add them to the list #}
     {% if distro.build is defined and distro.build.extra_variables is defined %}
     {% for var in distro.build.extra_variables %}
@@ -650,7 +654,7 @@ coverity:
     {% endfor %}
     {% endif %}
   needs:
-    - "{{distro.name}}:{{version}}@qemu-prep"
+    - "{{distro.name}}:{{version}}@container-prep"
 
 {% endif %}
 {% endfor %}
diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index 17446b80..4d5b2851 100644
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -135,8 +135,7 @@ distributions:
         - "MESON_TEST_ARGS: '' # litest-selftest fails on musl"
   - name: freebsd
     tag: *default_tag
-    want_qemu: true
-    skip_container: true
+    qemu_based: true
     versions:
       - '13.0'
     packages: