Merge pull request #39 from matrix-org/dinsic-release-v1.12.x

Merge Synapse release v1.12.0 into 'dinsic'

Accompanying Sytest PR: matrix-org/sytest#843

.buildkite/docker-compose-env

@@ -0,0 +1,13 @@
+CI
+BUILDKITE
+BUILDKITE_BUILD_NUMBER
+BUILDKITE_BRANCH
+BUILDKITE_BUILD_NUMBER
+BUILDKITE_JOB_ID
+BUILDKITE_BUILD_URL
+BUILDKITE_PROJECT_SLUG
+BUILDKITE_COMMIT
+BUILDKITE_PULL_REQUEST
+BUILDKITE_TAG
+CODECOV_TOKEN
+TRIAL_FLAGS

.buildkite/docker-compose.py35.pg95.yaml

@@ -6,16 +6,18 @@ services:
     image: postgres:9.5
     environment:
       POSTGRES_PASSWORD: postgres
+      POSTGRES_INITDB_ARGS: "--lc-collate C --lc-ctype C --encoding UTF8"
+    command: -c fsync=off
 
   testenv:
     image: python:3.5
     depends_on:
       - postgres
-    env_file: .env
+    env_file: docker-compose-env
     environment:
       SYNAPSE_POSTGRES_HOST: postgres
       SYNAPSE_POSTGRES_USER: postgres
       SYNAPSE_POSTGRES_PASSWORD: postgres
-    working_dir: /app
+    working_dir: /src
     volumes:
-      - ..:/app
+      - ${BUILDKITE_BUILD_CHECKOUT_PATH}:/src

.buildkite/docker-compose.py37.pg11.yaml

@@ -6,16 +6,18 @@ services:
     image: postgres:11
     environment:
       POSTGRES_PASSWORD: postgres
+      POSTGRES_INITDB_ARGS: "--lc-collate C --lc-ctype C --encoding UTF8"
+    command: -c fsync=off
 
   testenv:
     image: python:3.7
     depends_on:
       - postgres
-    env_file: .env
+    env_file: docker-compose-env
     environment:
       SYNAPSE_POSTGRES_HOST: postgres
       SYNAPSE_POSTGRES_USER: postgres
       SYNAPSE_POSTGRES_PASSWORD: postgres
-    working_dir: /app
+    working_dir: /src
     volumes:
-      - ..:/app
+      - ${BUILDKITE_BUILD_CHECKOUT_PATH}:/src

.buildkite/docker-compose.py37.pg95.yaml

@@ -6,16 +6,18 @@ services:
     image: postgres:9.5
     environment:
       POSTGRES_PASSWORD: postgres
+      POSTGRES_INITDB_ARGS: "--lc-collate C --lc-ctype C --encoding UTF8"
+    command: -c fsync=off
 
   testenv:
     image: python:3.7
     depends_on:
       - postgres
-    env_file: .env
+    env_file: docker-compose-env
     environment:
       SYNAPSE_POSTGRES_HOST: postgres
       SYNAPSE_POSTGRES_USER: postgres
       SYNAPSE_POSTGRES_PASSWORD: postgres
-    working_dir: /app
+    working_dir: /src
     volumes:
-      - ..:/app
+      - ${BUILDKITE_BUILD_CHECKOUT_PATH}:/src

.buildkite/docker-compose.py27.pg94.yaml → .buildkite/docker-compose.py38.pg12.yaml

@@ -3,19 +3,21 @@ version: '3.1'
 services:
 
   postgres:
-    image: postgres:9.4
+    image: postgres:12
     environment:
       POSTGRES_PASSWORD: postgres
+      POSTGRES_INITDB_ARGS: "--lc-collate C --lc-ctype C --encoding UTF8"
+    command: -c fsync=off
 
   testenv:
-    image: python:2.7
+    image: python:3.8
     depends_on:
       - postgres
-    env_file: .env
+    env_file: docker-compose-env
     environment:
       SYNAPSE_POSTGRES_HOST: postgres
       SYNAPSE_POSTGRES_USER: postgres
       SYNAPSE_POSTGRES_PASSWORD: postgres
-    working_dir: /app
+    working_dir: /src
     volumes:
-      - ..:/app
+      - ${BUILDKITE_BUILD_CHECKOUT_PATH}:/src

.buildkite/docker-compose.sytest.py37.redis.yaml

@@ -0,0 +1,22 @@
+version: '3.1'
+
+services:
+
+  redis:
+    image: redis:5.0
+
+  sytest:
+    image: matrixdotorg/sytest-synapse:py37
+    depends_on:
+      - redis
+    env_file: docker-compose-env
+    environment:
+      POSTGRES: "1"
+      WORKERS: "1"
+      BLACKLIST: "synapse-blacklist-with-workers"
+      REDIS: "redis"
+    working_dir: "/src"
+    entrypoint: ""
+    volumes:
+      - ${BUILDKITE_BUILD_CHECKOUT_PATH}:/src
+      - ${BUILDKITE_BUILD_CHECKOUT_PATH}/logs:/logs

.buildkite/merge_base_branch.sh

@@ -1,24 +1,25 @@
 #!/usr/bin/env bash
 
-set -ex
+set -e
 
-if [[ "$BUILDKITE_BRANCH" == "dinsic" ]]; then
+if [[ "$BUILDKITE_BRANCH" =~ ^(develop|master|dinsic|shhs|release-.*)$ ]]; then
     echo "Not merging forward, as this is a release branch"
     exit 0
 fi
 
 if [[ -z $BUILDKITE_PULL_REQUEST_BASE_BRANCH ]]; then
-     echo "Can't figure out what the PR number is! Assuming merge target is dinsic."
+    echo "Not a pull request, or hasn't had a PR opened yet..."
 
-    # It probably hasn't had a PR opened yet. Since all PRs for dinsic land on
-    # dinsic, we can probably assume it's based on it and will be merged into
-    # it.
+    # It probably hasn't had a PR opened yet. Since all PRs land on develop, we
+    # can probably assume it's based on it and will be merged into it.
     GITBASE="dinsic"
 else
     # Get the reference, using the GitHub API
     GITBASE=$BUILDKITE_PULL_REQUEST_BASE_BRANCH
 fi
 
+echo "--- merge_base_branch $GITBASE"
+
 # Show what we are before
 git --no-pager show -s
 
@@ -31,4 +32,4 @@ git fetch -u origin $GITBASE
 git merge --no-edit --no-commit origin/$GITBASE
 
 # Show what we are after.
-git --no-pager show -s
+git --no-pager show -s