[gnome-software/wip/mcrha/ci-test] b

[Milan Crha <mcrha src gnome org>]

commit 3ecb0f7394297814fca48546fbfe5b6e554743ee
Author: Milan Crha <mcrha redhat com>
Date:   Wed Mar 16 17:58:09 2022 +0100

    b

 .gitlab-ci.yml          | 1 -
 .gitlab-ci/run-tests.sh | 9 +++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81fb544d8..b93f481db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,6 @@ variables:
   G_MESSAGES_DEBUG: all
   MESON_COMMON_OPTIONS: "--buildtype debug --wrap-mode=nodownload --prefix /usr -Dsoup2=true"
   BUNDLE: "gnome-software-dev.flatpak"
-  FLATPAK_TRIGGERSDIR: /no/such/file/or/directory
 
 .build:
   before_script:
diff --git a/.gitlab-ci/run-tests.sh b/.gitlab-ci/run-tests.sh
index 800af92f4..cb550d329 100755
--- a/.gitlab-ci/run-tests.sh
+++ b/.gitlab-ci/run-tests.sh
@@ -12,10 +12,11 @@ case "$1" in
     log_file="_build/meson-logs/testlog.json"
 esac
 
-# Disable Flatpak triggers, by pointing to an invalid path,
-# to speed up the tests (specifically on Fedora, they could
-# even break the tests by a deadlock or something like that).
-#export FLATPAK_TRIGGERSDIR=/no/such/file/or/directory
+# Remove Flatpak triggers, to speed up the tests (specifically on Fedora,
+# they could even break the tests by a deadlock or something like that).
+if [ -d /usr/share/flatpak/triggers ]; then
+  sudo rm -rf /usr/share/flatpak/triggers
+fi
 
 # FIXME: The tests should be isolated and use mock services so they do not
 # require a functioning system bus. This will have to do for now though.