From a124b55ae61c1e73f98f5974d1d76247f2bad74a Mon Sep 17 00:00:00 2001
From: Nicolas Werner <n.werner@famedly.com>
Date: Mon, 20 Mar 2023 13:00:59 +0100
Subject: [PATCH 1/2] ci: more verbose logging of homeserver startup

This makes it easier to debug, why a server fails to start.
---
 scripts/integration-prepare-homeserver.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/integration-prepare-homeserver.sh b/scripts/integration-prepare-homeserver.sh
index 903fb20d..4f220591 100755
--- a/scripts/integration-prepare-homeserver.sh
+++ b/scripts/integration-prepare-homeserver.sh
@@ -31,8 +31,11 @@ fi
 
 echo "Waiting for homeserver to be available... (GET http://$HOMESERVER/_matrix/client/v3/login)"
 
-while ! curl -XGET "http://$HOMESERVER/_matrix/client/v3/login" >/dev/null 2>/dev/null; do
-  sleep 2
+sleep 5
+
+while ! curl -XGET "http://$HOMESERVER/_matrix/client/v3/login" >/dev/null; do
+  docker logs "$HOMESERVER_IMPLEMENTATION"
+  sleep 5
 done
 
 echo "Homeserver is up."

From 2c09a154a931e8427afdc8910f37e0e3cd87baf1 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <n.werner@famedly.com>
Date: Mon, 20 Mar 2023 13:20:30 +0100
Subject: [PATCH 2/2] fix: integration tests on dendrite

The relay_api now needs to be configured, see https://github.com/matrix-org/dendrite/pull/3011
---
 test_driver/dendrite/data/dendrite.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test_driver/dendrite/data/dendrite.yaml b/test_driver/dendrite/data/dendrite.yaml
index d37bca78..4497811f 100644
--- a/test_driver/dendrite/data/dendrite.yaml
+++ b/test_driver/dendrite/data/dendrite.yaml
@@ -278,6 +278,9 @@ room_server:
   database:
     connection_string: file:room_server.db
   
+relay_api:
+  database:
+    connection_string: file:relay_api.db
 
 # Configuration for the User API.
 user_api: