Fix CI for synapse_port_db (#6276)

* Don't use a virtualenv

* Generate the server's signing key to allow it to start

* Add signing key paths to CI configuration files

* Use a Python script to create the postgresql database

* Improve logging
pull/6284/head
Brendan Abolivier 2019-10-29 15:39:44 +00:00 committed by GitHub
parent 65cb307e19
commit d79151921a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 52 additions and 4 deletions

View File

@ -3,6 +3,8 @@
# CI's Docker setup at the point where this file is considered. # CI's Docker setup at the point where this file is considered.
server_name: "test" server_name: "test"
signing_key_path: "/src/.buildkite/test.signing.key"
report_stats: false report_stats: false
database: database:

View File

@ -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()

View File

@ -9,9 +9,7 @@
set -xe set -xe
cd `dirname $0`/../.. cd `dirname $0`/../..
# Create a virtualenv and use it. echo "--- Install dependencies"
virtualenv env
source env/bin/activate
# Install dependencies for this test. # Install dependencies for this test.
pip install psycopg2 coverage coverage-enable-subprocess pip install psycopg2 coverage coverage-enable-subprocess
@ -19,11 +17,20 @@ pip install psycopg2 coverage coverage-enable-subprocess
# Install Synapse itself. This won't update any libraries. # Install Synapse itself. This won't update any libraries.
pip install -e . 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. # 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 scripts-dev/update_database --database-config .buildkite/sqlite-config.yaml
# Create the PostgreSQL database. # 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 # Run the script
coverage run scripts/synapse_port_db --sqlite-database .buildkite/test_db.db --postgres-config .buildkite/postgres-config.yaml coverage run scripts/synapse_port_db --sqlite-database .buildkite/test_db.db --postgres-config .buildkite/postgres-config.yaml

View File

@ -3,6 +3,8 @@
# schema and run background updates on it. # schema and run background updates on it.
server_name: "test" server_name: "test"
signing_key_path: "/src/.buildkite/test.signing.key"
report_stats: false report_stats: false
database: database:

1
changelog.d/6276.misc Normal file
View File

@ -0,0 +1 @@
Add a CI job to test the `synapse_port_db` script.