From 39ba9c4c6560535ce4860c26a0bb85721d40f55d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
Date: Thu, 22 Aug 2024 14:00:06 +0200
Subject: [PATCH] ci: Run installed tests when running the dist job

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3973>
---
 .gitlab-ci.yml | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 807e0e037..d8f8ad439 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -96,7 +96,7 @@ variables:
     - .skip-git-clone
   variables:
     FDO_DISTRIBUTION_VERSION: 40
-    BASE_TAG: '2024-08-15.1'
+    BASE_TAG: '2024-08-22.0'
     MUTTER_USER: 'meta-user'
     FDO_DISTRIBUTION_PACKAGES:
       asciidoc
@@ -113,6 +113,7 @@ variables:
       busybox
       zenity
       python3-dbusmock
+      gnome-desktop-testing
       "pkgconfig(libgcrypt)"
       "pkgconfig(libdisplay-info)"
 
@@ -741,6 +742,39 @@ dist-mutter:
     - if: '$CI_MERGE_REQUEST_ASSIGNEES == "marge-bot"'
       when: on_success
 
+installed-tests-mutter@x86_64:
+  extends:
+    - .fdo.distribution-image@fedora
+    - .mutter.fedora@x86_64
+    - .build-mutter-base
+    - .test-setup
+  stage: deploy
+  needs:
+    - build-mutter@x86_64
+  script:
+    - meson install -C build --no-rebuild
+    - mkdir -m 1777 /tmp/.X11-unix
+    - mkdir installed-tests-logs
+    - gnome-desktop-testing-runner -L installed-tests-logs mutter
+  artifacts:
+    expire_in: 7 day
+    name: "mutter-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
+    when: always
+    paths:
+      - installed-tests-logs
+  rules:
+    - if: '$CI_PIPELINE_SOURCE != "merge_request_event"'
+      when: manual
+    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+      changes:
+        - "**/meson.build"
+        - meson/*
+      when: on_success
+    - if: '$GITLAB_USER_LOGIN == "marge-bot"'
+      when: on_success
+    - if: '$CI_MERGE_REQUEST_ASSIGNEES == "marge-bot"'
+      when: on_success
+
 dist-mutter-tarball:
   extends: dist-mutter
   needs: