CI: do not retry the qemu runs

[platform/upstream/libinput.git] / .gitlab-ci / config.yml

diff --git a/.gitlab-ci/config.yml b/.gitlab-ci/config.yml
index c17f371..4d5b285 100644 (file)
--- a/.gitlab-ci/config.yml
+++ b/.gitlab-ci/config.yml
@@ -3,16 +3,17 @@
 #
 
 # We're happy to rebuild all containers when one changes.
-.default_tag: &default_tag '2020-11-12.1'
+.default_tag: &default_tag '2022-06-10.0'
 
 distributions:
   - name: fedora
     tag: *default_tag
     versions:
-      - '31'
-      - '32'
+      - '35'
+      - '36' # last is picked for qemu
     want_qemu: true
     use_for_custom_build_tests: true
+    use_for_qemu_tests: true
     packages:
       - git-core
       - gcc
@@ -30,11 +31,12 @@ distributions:
       - python3-pytest-xdist
       - libwacom-devel
       - cairo-devel
-      - gtk3-devel
+      - gtk4-devel
       - glib2-devel
       - mtdev-devel
       - diffutils
-      - valgrind
+      - wayland-protocols-devel
+      - valgrind        # for the valgrind run, optional
   - name: debian
     tag: *default_tag
     versions:
@@ -59,11 +61,11 @@ distributions:
       - libgtk-3-dev
       - libglib2.0-dev
       - libmtdev-dev
+      - curl            # for the coverity job
   - name: ubuntu
     tag: *default_tag
     versions:
-      - '20.04'
-      - '20.10'
+      - '22.04'
     packages:
       - git
       - gcc
@@ -103,9 +105,10 @@ distributions:
       - python-sphinx_rtd_theme
       - python-pytest-xdist
       - libwacom
-      - gtk3
+      - gtk4
       - mtdev
       - diffutils
+      - wayland-protocols
   - name: alpine
     tag: *default_tag
     versions:
@@ -120,7 +123,7 @@ distributions:
       - libevdev-dev
       - libwacom-dev
       - cairo-dev
-      - gtk+3.0-dev
+      - gtk4.0-dev
       - mtdev-dev
       - bash
     build:
@@ -132,49 +135,63 @@ distributions:
         - "MESON_TEST_ARGS: '' # litest-selftest fails on musl"
   - name: freebsd
     tag: *default_tag
+    qemu_based: true
+    versions:
+      - '13.0'
     packages:
+      - git
+      - pkgconf
+      - meson
       - libepoll-shim
       - libudev-devd
       - libevdev
       - libwacom
       - gtk3
       - libmtdev
-    does_not_have_ci_templates: true
+      - bash
+      - wayland
+    build:
+      extra_variables:
+        - "MESON_ARGS: '-Dtests=false -Ddocumentation=false' # doxygen drags down too many deps"
+        # We don't run the tests on FreeBSD, someone would have to fix the
+        # test suite to work on BSD first.
+        - "MESON_TEST_ARGS: '' # test suite doesn't work on BSD yet"
 
 test_suites:
   - name: touchpad
     suites:
-      touchpad
+      - touchpad
   - name: tap
     suites:
-      tap
+      - touchpad-tap
+  - name: touchpad-buttons
+    suites:
+      - touchpad-buttons
   - name: tablet
     suites:
-      tablet
+      - tablet
   - name: gestures-device
     suites:
-      gestures
-      device
-  - name: others
+      - gestures
+      - device
+  - name: backends
+    suites:
+      - path
+      - udev
+  - name: misc
+    suites:
+      - log
+      - misc
+      - quirks
+  - name: other devices
     suites:
-      context
-      config
-      misc
-      events
-      totem
-      udev
-      lid
-      log
-      timer
-      tablet-mode
-      quirks
-      trackball
-      pad
-      path
-      keyboard
-      switch
-      touch
-      trackpoint
+      - keyboard
+      - pad
+      - switch
+      - trackball
+      - trackpoint
+      - totem
+      - touch
   - name: pointer
     suites:
-      pointer
+      - pointer