Commit ebfb1e77 authored by Peter Hutterer's avatar Peter Hutterer

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

No functional changes here, it just makes the actual task more generic
Signed-off-by: Peter Hutterer's avatarPeter Hutterer <peter.hutterer@who-t.net>
parent dd8dcaaa
......@@ -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
......
......@@ -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:
......
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