ci: Move test setup into template job

This will allow sharing the setup between test jobs and a future
dist job.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1980>
This commit is contained in:
Florian Müllner 2021-08-31 19:08:27 +02:00
parent f41b165f9c
commit 4bbe61d47e
2 changed files with 19 additions and 26 deletions

View File

@ -230,19 +230,32 @@ build-without-native-backend-and-wayland@x86_64:
paths: paths:
- build/meson-logs - build/meson-logs
.test-mutter: .test-setup: &test-setup
extends:
- .fdo.distribution-image@fedora
stage: test
variables: variables:
XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir" XDG_RUNTIME_DIR: "$CI_PROJECT_DIR/runtime-dir"
GSETTINGS_SCHEMA_DIR: "$CI_PROJECT_DIR/build/data" 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" G_SLICE: "always-malloc"
MALLOC_CHECK_: "3" MALLOC_CHECK_: "3"
NO_AT_BRIDGE: "1" 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 - 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 -- xvfb-run -a -s "$XVFB_SERVER_ARGS"
catchsegv meson test -C build --no-rebuild -t 10
artifacts: artifacts:
expire_in: 1 day expire_in: 1 day
reports: reports:

View File

@ -1,20 +0,0 @@
#!/usr/bin/bash
set -e
dconf update
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-*
PIPEWIRE_DEBUG=2 PIPEWIRE_LOG="$CI_PROJECT_DIR/build/meson-logs/pipewire.log" \
pipewire &
sleep 2
meson test -C build --no-rebuild --setup CI
exit_code=$?
exit $exit_code