[mutter/wip/carlosg/test: 3/5] ci: Move test setup into template job
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wip/carlosg/test: 3/5] ci: Move test setup into template job
- Date: Sat, 4 Sep 2021 13:29:37 +0000 (UTC)
commit 4a033d19952bda398d1d1020aae934840b58116a
Author: Florian Müllner <fmuellner gnome org>
Date: Tue Aug 31 19:08:27 2021 +0200
ci: Move test setup into template job
This will allow sharing the setup between test jobs and a future
dist job.
.gitlab-ci.yml | 26 ++++++++++++++++++++------
.gitlab-ci/run-tests.sh | 20 --------------------
2 files changed, 20 insertions(+), 26 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e361c31a7..ca97116d4e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -230,19 +230,33 @@ build-without-native-backend-and-wayland@x86_64:
paths:
- build/meson-logs
-.test-mutter:
- extends:
- - .fdo.distribution-image@fedora
- stage: test
+.test-setup: &test-setup
variables:
XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
GSETTINGS_SCHEMA_DIR: "$CI_PROJECT_DIR/build/data"
+ MUTTER_DEBUG_DUMMY_MODE_SPECS: "800x600@10.0"
+ PIPEWIRE_DEBUG: 2
+ PIPEWIRE_LOG: "$CI_PROJECT_DIR/build/meson-logs/pipewire.log"
+ XVFB_SERVER_ARGS: "+iglx -noreset"
G_SLICE: "always-malloc"
MALLOC_CHECK_: "3"
NO_AT_BRIDGE: "1"
- script:
+ before_script:
+ - glib-compile-schemas $GSETTINGS_SCHEMA_DIR
+ # Disable e.g. audio support to not dead lock screen cast tests
+ - rm -f /usr/share/pipewire/media-session.d/with-*
- mkdir -m 700 $XDG_RUNTIME_DIR
- - dbus-run-session -- bash -x ./.gitlab-ci/run-tests.sh
+ - pipewire & sleep 2
+
+.test-mutter:
+ extends:
+ - .fdo.distribution-image@fedora
+ <<: *test-setup
+ stage: test
+ script:
+ - dbus-run-session -- src/tests/meta-dbus-runner.py
+ xvfb-run -s "$XVFB_SERVER_ARGS"
+ meson test -C build --no-rebuild -t 10 --wrap catchsegv
artifacts:
expire_in: 1 day
reports:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]