Skip to content
Snippets Groups Projects
Commit dd8dcaaa authored by Peter Hutterer's avatar Peter Hutterer
Browse files

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: default avatarPeter Hutterer <peter.hutterer@who-t.net>
parent 5eb53418
No related branches found
No related tags found
No related merge requests found
...@@ -554,118 +554,118 @@ freebsd:11.2@container-clean: ...@@ -554,118 +554,118 @@ freebsd:11.2@container-clean:
when: script_failure when: script_failure
needs: ['fedora:30@qemu-prep'] needs: ['fedora:30@qemu-prep']
fedora:30@vm-touchpad: vm-touchpad:
extends: extends:
- .fedora:30@test-suite-vm - .fedora:30@test-suite-vm
variables: variables:
SUITE_NAMES: 'touchpad' SUITE_NAMES: 'touchpad'
fedora:30@vm-touchpad-no-libwacom: vm-touchpad-no-libwacom:
extends: extends:
- fedora:30@vm-touchpad - vm-touchpad
variables: variables:
MESON_ARGS: '-Dlibwacom=false' MESON_ARGS: '-Dlibwacom=false'
fedora:30@vm-tap: vm-tap:
extends: extends:
- .fedora:30@test-suite-vm - .fedora:30@test-suite-vm
variables: variables:
SUITE_NAMES: 'tap' SUITE_NAMES: 'tap'
fedora:30@vm-tap-no-libwacom: vm-tap-no-libwacom:
extends: extends:
- fedora:30@vm-tap - vm-tap
variables: variables:
MESON_ARGS: '-Dlibwacom=false' MESON_ARGS: '-Dlibwacom=false'
fedora:30@vm-tablet: vm-tablet:
extends: extends:
- .fedora:30@test-suite-vm - .fedora:30@test-suite-vm
variables: variables:
SUITE_NAMES: 'tablet' SUITE_NAMES: 'tablet'
fedora:30@vm-tablet-no-libwacom: vm-tablet-no-libwacom:
extends: extends:
- fedora:30@vm-tablet - vm-tablet
variables: variables:
MESON_ARGS: '-Dlibwacom=false' MESON_ARGS: '-Dlibwacom=false'
fedora:30@vm-gestures-device: vm-gestures-device:
extends: extends:
- .fedora:30@test-suite-vm - .fedora:30@test-suite-vm
variables: variables:
SUITE_NAMES: 'gestures device' SUITE_NAMES: 'gestures device'
fedora:30@vm-gestures-device-no-libwacom: vm-gestures-device-no-libwacom:
extends: extends:
- fedora:30@vm-gestures-device - vm-gestures-device
variables: variables:
MESON_ARGS: '-Dlibwacom=false' MESON_ARGS: '-Dlibwacom=false'
fedora:30@vm-others: vm-others:
extends: extends:
- .fedora:30@test-suite-vm - .fedora:30@test-suite-vm
variables: variables:
SUITE_NAMES: 'context config misc events totem udev lid log timer tablet-mode quirks trackball pad path keyboard switch touch trackpoint' 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: extends:
- fedora:30@vm-others - vm-others
variables: variables:
MESON_ARGS: '-Dlibwacom=false' MESON_ARGS: '-Dlibwacom=false'
fedora:30@vm-pointer: vm-pointer:
extends: extends:
- .fedora:30@test-suite-vm - .fedora:30@test-suite-vm
variables: variables:
SUITE_NAMES: 'pointer' SUITE_NAMES: 'pointer'
fedora:30@vm-pointer-no-libwacom: vm-pointer-no-libwacom:
extends: extends:
- fedora:30@vm-pointer - vm-pointer
variables: variables:
MESON_ARGS: '-Dlibwacom=false' MESON_ARGS: '-Dlibwacom=false'
fedora:30@valgrind-touchpad: vm-valgrind-touchpad:
stage: valgrind stage: valgrind
extends: extends:
- fedora:30@vm-touchpad - vm-touchpad
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
fedora:30@valgrind-tap: vm-valgrind-tap:
stage: valgrind stage: valgrind
extends: extends:
- fedora:30@vm-tap - vm-tap
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
fedora:30@valgrind-tablet: vm-valgrind-tablet:
stage: valgrind stage: valgrind
extends: extends:
- fedora:30@vm-tablet - vm-tablet
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
fedora:30@valgrind-gestures-device: vm-valgrind-gestures-device:
stage: valgrind stage: valgrind
extends: extends:
- fedora:30@vm-gestures-device - vm-gestures-device
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
fedora:30@valgrind-others: vm-valgrind-others:
stage: valgrind stage: valgrind
extends: extends:
- fedora:30@vm-others - vm-others
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
fedora:30@valgrind-pointer: vm-valgrind-pointer:
stage: valgrind stage: valgrind
extends: extends:
- fedora:30@vm-pointer - vm-pointer
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
......
...@@ -444,25 +444,25 @@ freebsd:11.2@container-clean: ...@@ -444,25 +444,25 @@ freebsd:11.2@container-clean:
needs: ['fedora:30@qemu-prep'] needs: ['fedora:30@qemu-prep']
{% for suite in test_suites %} {% for suite in test_suites %}
fedora:30@vm-{{suite.name}}: vm-{{suite.name}}:
extends: extends:
- .fedora:30@test-suite-vm - .fedora:30@test-suite-vm
variables: variables:
SUITE_NAMES: '{{suite.suites}}' SUITE_NAMES: '{{suite.suites}}'
fedora:30@vm-{{suite.name}}-no-libwacom: vm-{{suite.name}}-no-libwacom:
extends: extends:
- fedora:30@vm-{{suite.name}} - vm-{{suite.name}}
variables: variables:
MESON_ARGS: '-Dlibwacom=false' MESON_ARGS: '-Dlibwacom=false'
{% endfor %} {% endfor %}
{% for suite in test_suites %} {% for suite in test_suites %}
fedora:30@valgrind-{{suite.name}}: vm-valgrind-{{suite.name}}:
stage: valgrind stage: valgrind
extends: extends:
- fedora:30@vm-{{suite.name}} - vm-{{suite.name}}
variables: variables:
MESON_TEST_ARGS: '--setup=valgrind' MESON_TEST_ARGS: '--setup=valgrind'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment