Move scripts which aren't in docker out of docker

docker/bootstrap.sh

@@ -4,24 +4,28 @@
 
 set -ex
 
+export SYTEST_TARGET="$1"
+shift
+
 if [ -d "/sytest" ]; then
     # If the user has mounted in a SyTest checkout, use that.
-    echo "Using local sytests..."
+    echo "Using local sytests"
 else
+    echo "--- Trying to get same-named sytest branch..."
+
     if [ -n "BUILDKITE_BRANCH" ]; then
         branch_name=$BUILDKITE_BRANCH
     else
         # Otherwise, try and find out what the branch that the Synapse/Dendrite checkout is using. Fall back to develop if it's not a branch.
         branch_name="$(git --git-dir=/src/.git symbolic-ref HEAD 2>/dev/null)" || branch_name="develop"
 
-        if [ "$1" == "dendrite" ] && [ branch_name == "master" ]; then
+        if [ "$SYTEST_TARGET" == "dendrite" ] && [ branch_name == "master" ]; then
             # Dendrite uses master as its main branch. If the branch is master, we probably want sytest develop
             branch_name="develop"
         fi
     fi
 
     # Try and fetch the branch
-    echo "Trying to get same-named sytest branch..."
     wget -q https://github.com/matrix-org/sytest/archive/$branch_name.tar.gz -O sytest.tar.gz || {
         # Probably a 404, fall back to develop
         echo "Using develop instead..."
@@ -32,8 +36,18 @@ else
     tar -C /sytest --strip-components=1 -xf sytest.tar.gz
 fi
 
+echo "--- Preparing sytest for ${SYTEST_TARGET}"
+
 export SYTEST_LIB="/sytest/lib"
-SYTEST_SCRIPT="/sytest/docker/$1_sytest.sh"
 
-# Run the sytest script
-$SYTEST_SCRIPT "${@:2}"
+if [ -x "/sytest/scripts/${SYTEST_TARGET}_sytest.sh" ]; then
+    exec "/sytest/scripts/${SYTEST_TARGET}_sytest.sh" "$@"
+
+elif [ -x "/sytest/docker/${SYTEST_TARGET}_sytest.sh" ]; then
+    # old branches of sytest used to put the sytest running script in the "/docker" directory
+    exec "/sytest/docker/${SYTEST_TARGET}_sytest.sh" "$@"
+
+else
+    echo "sytest runner script for ${SYTEST_TARGET} not found" >&2
+    exit 1
+fi

docker/dendrite_sytest.sh → scripts/dendrite_sytest.sh

@@ -1,4 +1,9 @@
-#! /usr/bin/env bash
+#!/bin/bash
+#
+# This script is run by the bootstrap.sh script in the docker image.
+#
+# It expects to find a built dendrite in /src/bin. It sets up the
+# postgres database and runs sytest against dendrite.
 
 set -ex
 

docker/synapse_sytest.sh → scripts/synapse_sytest.sh

@@ -1,10 +1,17 @@
 #!/bin/bash
 #
+# This script is run by the bootstrap.sh script in the docker image.
+#
+# It expects to find the synapse source in /src, and a virtualenv in /venv.
+# It installs synapse into the virtualenv, configures sytest according to the
+# env vars, and runs sytest.
+#
+
 # Run the sytests.
 
 set -ex
 
-cd /sytest
+cd "$(dirname $0)/.."
 
 mkdir /work
 
@@ -18,7 +25,7 @@ if [ -n "$POSTGRES" ]; then
     su -c 'eatmydata /usr/lib/postgresql/*/bin/pg_ctl -w -D $PGDATA start' postgres
 
     # Write out the configuration for a PostgreSQL using Synapse
-    docker/prep_sytest_for_postgres.sh
+    ./scripts/prep_sytest_for_postgres.sh
 
     # Make the test databases for the two Synapse servers that will be spun up
     su -c 'psql -c "CREATE DATABASE pg1;"' postgres