chore: use Famedly runners

Signed-off-by: TheOneWithTheBraid <the-one@with-the-braid.cf>

scripts/integration-create-environment-variables.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+export USER1_NAME="alice"
+export USER1_PW="AliceInWonderland"
+export USER2_NAME="bob"
+export USER2_PW="JoWirSchaffenDas"

scripts/integration-prepare-homeserver.sh

@@ -1,8 +1,35 @@
 #!/usr/bin/env bash
-IP_ADDRESS="$(drill docker | grep -m 1 -P "\d+\.\d+\.\d+.\d+" | awk -F ' ' '{print $NF}')"
 
-sed -i "s/10.0.2.2/$IP_ADDRESS/g" integration_test/users.dart
+if [ -z $HOMESERVER ]; then
+  echo "Please ensure HOMESERVER environment variable is set to the IP or hostname of the homeserver."
+  exit 1
+fi
+if [ -z $USER1_NAME ]; then
+  echo "Please ensure USER1_NAME environment variable is set to first user name."
+  exit 1
+fi
+if [ -z $USER1_PW ]; then
+  echo "Please ensure USER1_PW environment variable is set to first user password."
+  exit 1
+fi
+if [ -z $USER2_NAME ]; then
+  echo "Please ensure USER2_NAME environment variable is set to second user name."
+  exit 1
+fi
+if [ -z $USER2_PW ]; then
+  echo "Please ensure USER2_PW environment variable is set to second user password."
+  exit 1
+fi
 
-curl -XPOST -d '{"username":"alice", "password":"AliceInWonderland", "inhibit_login":true, "auth": {"type":"m.login.dummy"}}' "http://$IP_ADDRESS:8008/_matrix/client/r0/register"
-curl -XPOST -d '{"username":"bob", "password":"JoWirSchaffenDas", "inhibit_login":true, "auth": {"type":"m.login.dummy"}}' "http://$IP_ADDRESS:8008/_matrix/client/r0/register"
-curl -XPOST -d '{"username":"trudy", "password":"HaveIBeenPwned", "inhibit_login":true, "auth": {"type":"m.login.dummy"}}' "http://$IP_ADDRESS:8008/_matrix/client/r0/register"
+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
+done
+
+echo "Homeserver is up."
+
+# create users
+
+curl -fS --retry 3 -XPOST -d "{\"username\":\"$USER1_NAME\", \"password\":\"$USER1_PW\", \"inhibit_login\":true, \"auth\": {\"type\":\"m.login.dummy\"}}" "http://$HOMESERVER/_matrix/client/r0/register"
+curl -fS --retry 3 -XPOST -d "{\"username\":\"$USER2_NAME\", \"password\":\"$USER2_PW\", \"inhibit_login\":true, \"auth\": {\"type\":\"m.login.dummy\"}}" "http://$HOMESERVER/_matrix/client/r0/register"

scripts/integration-server-conduit.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
- docker run -d \
+docker run -d \
   -e CONDUIT_SERVER_NAME="localhost" \
   -e CONDUIT_PORT="8008" \
   -e CONDUIT_DATABASE_BACKEND="rocksdb" \
@@ -9,6 +9,4 @@
   -e CONDUIT_TRUSTED_SERVERS="[\"conduit.rs\"]" \
   -e CONDUIT_MAX_CONCURRENT_REQUESTS="100" \
   -e CONDUIT_LOG="info,rocket=off,_=off,sled=off" \
-  --name conduit -p 8008:8008 matrixconduit/matrix-conduit:latest
-
-sleep 20
+  --name conduit -p 80:8008 matrixconduit/matrix-conduit:latest

scripts/integration-server-dendrite.sh

@@ -10,7 +10,5 @@ docker run --rm --entrypoint="" \
   -tls-cert /mnt/server.crt \
   -tls-key /mnt/server.key
 
- docker run -d --volume="$(pwd)/integration_test/dendrite/data":/etc/dendrite:rw \
-  --name dendrite -p 8008:8008 matrixdotorg/dendrite-monolith:latest -really-enable-open-registration
-
-sleep 20
+docker run -d --volume="$(pwd)/integration_test/dendrite/data":/etc/dendrite:rw \
+  --name dendrite -p 80:8008 matrixdotorg/dendrite-monolith:latest -really-enable-open-registration

scripts/integration-server-synapse.sh

@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
-chown -R 991:991 integration_test/synapse
-docker run -d --name synapse --user 991:991 --volume="$(pwd)/integration_test/synapse/data":/data:rw -p 8008:8008 matrixdotorg/synapse:latest
-sleep 20
+docker run -d --name synapse --tmpfs /data \
+    --volume="$(pwd)/integration_test/synapse/data/homeserver.yaml":/data/homeserver.yaml:rw \
+    --volume="$(pwd)/integration_test/synapse/data/localhost.log.config":/data/localhost.log.config:rw \
+    -p 80:80 matrixdotorg/synapse:latest