diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-26 09:56:50 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2020-02-26 13:56:00 +1000 |
| commit | ebfb1e770e87113c4634977ba5714e21a9085592 (patch) | |
| tree | 72d7f5d35210b66df2f30751c4580eb1169eadd1 | |
| parent | dd8dcaaa9458aa4a165e63c6e70439578eb3d976 (diff) | |
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 <peter.hutterer@who-t.net>
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | .gitlab-ci/gitlab-ci.tmpl | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b312437a..2bad91be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl index c0074edd..fc66b60f 100644 --- a/.gitlab-ci/gitlab-ci.tmpl +++ b/.gitlab-ci/gitlab-ci.tmpl @@ -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: |