gitlab CI: invert the ci-templates check

This makes the config file simpler, use a variable that is default false but
true where we need it.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index ccf158fc404dccfdef148cd21c7b379e231012e9..50308fb369b8ebdbfedb8d22aada1e40fe6fb5c6 100644 (file)
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -37,7 +37,7 @@
 
 include:
   {% for distro in distributions|sort(attribute="name") %}
-  {% if distro.ci_templates %}
+  {% if not distro.does_not_have_ci_templates %}
   # {{ distro.name.capitalize() }} container builder template
   - project: 'freedesktop/ci-templates'
     ref: *template_sha

diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index f97b2d5d7f034341efe69460d8a01b35d4c1f61d..6e930f6bb302afa9a7e789c134b06f38df83ace3 100644 (file)
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -13,18 +13,15 @@ distributions:
       - '31'
       - '32'
     want_qemu: true
-    ci_templates: true
   - name: ubuntu
     tag: *default_tag
     versions:
       - '19.10'
       - '19.04'
-    ci_templates: true
   - name: arch
     tag: *default_tag
     versions:
       - 'rolling'
-    ci_templates: true
   - name: alpine
     tag: *default_tag
     versions:
@@ -36,10 +33,9 @@ distributions:
         # for any tcase_add_exit_test/tcase_add_test_raise_signal
         # but someone more invested in musl will have to figure that out.
         - "MESON_TEST_ARGS: '' # litest-selftest fails on musl"
-    ci_templates: true
   - name: freebsd
     tag: *default_tag
-    ci_templates: false
+    does_not_have_ci_templates: true
 
 test_suites:
   - name: touchpad