Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Fix CI for synapse_port_db (#6276)
Browse files Browse the repository at this point in the history
* commit 'd79151921':
  Fix CI for synapse_port_db (#6276)
  • Loading branch information
anoadragon453 committed Mar 16, 2020
2 parents 4a47ecf + d791519 commit b3564c9
Show file tree
Hide file tree
Showing 5 changed files with 52 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .buildkite/postgres-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# CI's Docker setup at the point where this file is considered.
server_name: "test"

signing_key_path: "/src/.buildkite/test.signing.key"

report_stats: false

database:
Expand Down
36 changes: 36 additions & 0 deletions .buildkite/scripts/create_postgres_db.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# Copyright 2019 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import logging
from synapse.storage.engines import create_engine

logger = logging.getLogger("create_postgres_db")

if __name__ == "__main__":
# Create a PostgresEngine.
db_engine = create_engine({"name": "psycopg2", "args": {}})

# Connect to postgres to create the base database.
# We use "postgres" as a database because it's bound to exist and the "synapse" one
# doesn't exist yet.
db_conn = db_engine.module.connect(
user="postgres", host="postgres", password="postgres", dbname="postgres"
)
db_conn.autocommit = True
cur = db_conn.cursor()
cur.execute("CREATE DATABASE synapse;")
cur.close()
db_conn.close()
15 changes: 11 additions & 4 deletions .buildkite/scripts/test_synapse_port_db.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,28 @@
set -xe
cd `dirname $0`/../..

# Create a virtualenv and use it.
virtualenv env
source env/bin/activate
echo "--- Install dependencies"

# Install dependencies for this test.
pip install psycopg2 coverage coverage-enable-subprocess

# Install Synapse itself. This won't update any libraries.
pip install -e .

echo "--- Generate the signing key"

# Generate the server's signing key.
python -m synapse.app.homeserver --generate-keys -c .buildkite/sqlite-config.yaml

echo "--- Prepare the databases"

# Make sure the SQLite3 database is using the latest schema and has no pending background update.
scripts-dev/update_database --database-config .buildkite/sqlite-config.yaml

# Create the PostgreSQL database.
PGPASSWORD=postgres createdb -h postgres -U postgres synapse
./.buildkite/scripts/create_postgres_db.py

echo "+++ Run synapse_port_db"

# Run the script
coverage run scripts/synapse_port_db --sqlite-database .buildkite/test_db.db --postgres-config .buildkite/postgres-config.yaml
2 changes: 2 additions & 0 deletions .buildkite/sqlite-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# schema and run background updates on it.
server_name: "test"

signing_key_path: "/src/.buildkite/test.signing.key"

report_stats: false

database:
Expand Down
1 change: 1 addition & 0 deletions changelog.d/6276.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add a CI job to test the `synapse_port_db` script.

0 comments on commit b3564c9

Please sign in to comment.