fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-04-05 11:20:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

gitlab CI: split the task to run on a VM out from the host system

Browse source 
No functional changes here, it just makes the actual task more generic

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer 2020-02-26 09:56:50 +10:00
parent dd8dcaaa94
commit ebfb1e770e
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.gitlab-ci.yml
View file

@ -495,15 +495,13 @@ freebsd:11.2@container-clean:
# - SUITES: the meson test suites to run, or
# - SUITE_NAMES: all elements will be expanded to libinput-test-suite-$value
# Set one or the other, not both.
.fedora:30@test-suite-vm:
.test-suite-vm:
extends:
- .policy
stage: VM
image: $QEMU_CONTAINER_IMAGE
tags:
- kvm
variables:
FEDORA_VERSION: 30
MESON_BUILDDIR: build_dir
# remove the global --no-suite=hardware
MESON_TEST_ARGS: ''
@ -552,8 +550,16 @@ freebsd:11.2@container-clean:
retry:
max: 2
when: script_failure
.fedora:30@test-suite-vm:
extends: .test-suite-vm
image: $QEMU_CONTAINER_IMAGE
variables:
FEDORA_VERSION: 30
needs: ['fedora:30@qemu-prep']
vm-touchpad:
extends:
- .fedora:30@test-suite-vm

12
.gitlab-ci/gitlab-ci.tmpl
View file

@ -384,15 +384,13 @@ freebsd:11.2@container-clean:
# - SUITES: the meson test suites to run, or
# - SUITE_NAMES: all elements will be expanded to libinput-test-suite-$value
# Set one or the other, not both.
.fedora:30@test-suite-vm:
.test-suite-vm:
extends:
- .policy
stage: VM
image: $QEMU_CONTAINER_IMAGE
tags:
- kvm
variables:
FEDORA_VERSION: 30
MESON_BUILDDIR: build_dir
# remove the global --no-suite=hardware
MESON_TEST_ARGS: ''
@ -441,8 +439,16 @@ freebsd:11.2@container-clean:
retry:
max: 2
when: script_failure
.fedora:30@test-suite-vm:
extends: .test-suite-vm
image: $QEMU_CONTAINER_IMAGE
variables:
FEDORA_VERSION: 30
needs: ['fedora:30@qemu-prep']
{% for suite in test_suites %}
vm-{{suite.name}}:
extends: