Commit dd8dcaaa authored by Peter Hutterer's avatar Peter Hutterer

gitlab CI: drop the distro name from the VM jobs

This changes rarely and it doesn't carry a lot of information anyway, at least
compared to the jobs that are specifically designed to build on various
distributions.
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent 5eb53418
......@@ -554,118 +554,118 @@ freebsd:11.2@container-clean:
when: script_failure
needs: ['fedora:30@qemu-prep']
fedora:30@vm-touchpad:
vm-touchpad:
extends:
- .fedora:30@test-suite-vm
variables:
SUITE_NAMES: 'touchpad'
fedora:30@vm-touchpad-no-libwacom:
vm-touchpad-no-libwacom:
extends:
- fedora:30@vm-touchpad
- vm-touchpad
variables:
MESON_ARGS: '-Dlibwacom=false'
fedora:30@vm-tap:
vm-tap:
extends:
- .fedora:30@test-suite-vm
variables:
SUITE_NAMES: 'tap'
fedora:30@vm-tap-no-libwacom:
vm-tap-no-libwacom:
extends:
- fedora:30@vm-tap
- vm-tap
variables:
MESON_ARGS: '-Dlibwacom=false'
fedora:30@vm-tablet:
vm-tablet:
extends:
- .fedora:30@test-suite-vm
variables:
SUITE_NAMES: 'tablet'
fedora:30@vm-tablet-no-libwacom:
vm-tablet-no-libwacom:
extends:
- fedora:30@vm-tablet
- vm-tablet
variables:
MESON_ARGS: '-Dlibwacom=false'
fedora:30@vm-gestures-device:
vm-gestures-device:
extends:
- .fedora:30@test-suite-vm
variables:
SUITE_NAMES: 'gestures device'
fedora:30@vm-gestures-device-no-libwacom:
vm-gestures-device-no-libwacom:
extends:
- fedora:30@vm-gestures-device
- vm-gestures-device
variables:
MESON_ARGS: '-Dlibwacom=false'
fedora:30@vm-others:
vm-others:
extends:
- .fedora:30@test-suite-vm
variables:
SUITE_NAMES: 'context config misc events totem udev lid log timer tablet-mode quirks trackball pad path keyboard switch touch trackpoint'
fedora:30@vm-others-no-libwacom:
vm-others-no-libwacom:
extends:
- fedora:30@vm-others
- vm-others
variables:
MESON_ARGS: '-Dlibwacom=false'
fedora:30@vm-pointer:
vm-pointer:
extends:
- .fedora:30@test-suite-vm
variables:
SUITE_NAMES: 'pointer'
fedora:30@vm-pointer-no-libwacom:
vm-pointer-no-libwacom:
extends:
- fedora:30@vm-pointer
- vm-pointer
variables:
MESON_ARGS: '-Dlibwacom=false'
fedora:30@valgrind-touchpad:
vm-valgrind-touchpad:
stage: valgrind
extends:
- fedora:30@vm-touchpad
- vm-touchpad
variables:
MESON_TEST_ARGS: '--setup=valgrind'
fedora:30@valgrind-tap:
vm-valgrind-tap:
stage: valgrind
extends:
- fedora:30@vm-tap
- vm-tap
variables:
MESON_TEST_ARGS: '--setup=valgrind'
fedora:30@valgrind-tablet:
vm-valgrind-tablet:
stage: valgrind
extends:
- fedora:30@vm-tablet
- vm-tablet
variables:
MESON_TEST_ARGS: '--setup=valgrind'
fedora:30@valgrind-gestures-device:
vm-valgrind-gestures-device:
stage: valgrind
extends:
- fedora:30@vm-gestures-device
- vm-gestures-device
variables:
MESON_TEST_ARGS: '--setup=valgrind'
fedora:30@valgrind-others:
vm-valgrind-others:
stage: valgrind
extends:
- fedora:30@vm-others
- vm-others
variables:
MESON_TEST_ARGS: '--setup=valgrind'
fedora:30@valgrind-pointer:
vm-valgrind-pointer:
stage: valgrind
extends:
- fedora:30@vm-pointer
- vm-pointer
variables:
MESON_TEST_ARGS: '--setup=valgrind'
......
......@@ -444,25 +444,25 @@ freebsd:11.2@container-clean:
needs: ['fedora:30@qemu-prep']
{% for suite in test_suites %}
fedora:30@vm-{{suite.name}}:
vm-{{suite.name}}:
extends:
- .fedora:30@test-suite-vm
variables:
SUITE_NAMES: '{{suite.suites}}'
fedora:30@vm-{{suite.name}}-no-libwacom:
vm-{{suite.name}}-no-libwacom:
extends:
- fedora:30@vm-{{suite.name}}
- vm-{{suite.name}}
variables:
MESON_ARGS: '-Dlibwacom=false'
{% endfor %}
{% for suite in test_suites %}
fedora:30@valgrind-{{suite.name}}:
vm-valgrind-{{suite.name}}:
stage: valgrind
extends:
- fedora:30@vm-{{suite.name}}
- vm-{{suite.name}}
variables:
MESON_TEST_ARGS: '--setup=valgrind'
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment