diff options
author | David Robertson <david.m.robertson1@gmail.com> | 2021-08-10 13:11:43 +0100 |
---|---|---|
committer | David Robertson <david.m.robertson1@gmail.com> | 2021-08-10 16:38:13 +0100 |
commit | 58e5da5aa06ee4dc1ad5b2774e7bcd4eb9911a70 (patch) | |
tree | 1181b69d0d8dad6c8a72787529da2c64764cfb96 /.buildkite | |
parent | Remove unused BUILDKITE_BRANCH env var (diff) | |
download | synapse-58e5da5aa06ee4dc1ad5b2774e7bcd4eb9911a70.tar.xz |
Remove buildkite from portdb CI tests
Diffstat (limited to '.buildkite')
-rw-r--r-- | .buildkite/postgres-config.yaml | 19 | ||||
-rwxr-xr-x | .buildkite/scripts/postgres_exec.py | 31 | ||||
-rwxr-xr-x | .buildkite/scripts/test_synapse_port_db.sh | 57 | ||||
-rw-r--r-- | .buildkite/sqlite-config.yaml | 16 |
4 files changed, 0 insertions, 123 deletions
diff --git a/.buildkite/postgres-config.yaml b/.buildkite/postgres-config.yaml deleted file mode 100644 index 67e17fa9d1..0000000000 --- a/.buildkite/postgres-config.yaml +++ /dev/null @@ -1,19 +0,0 @@ -# Configuration file used for testing the 'synapse_port_db' script. -# Tells the script to connect to the postgresql database that will be available in the -# CI's Docker setup at the point where this file is considered. -server_name: "localhost:8800" - -signing_key_path: ".buildkite/test.signing.key" - -report_stats: false - -database: - name: "psycopg2" - args: - user: postgres - host: postgres - password: postgres - database: synapse - -# Suppress the key server warning. -trusted_key_servers: [] diff --git a/.buildkite/scripts/postgres_exec.py b/.buildkite/scripts/postgres_exec.py deleted file mode 100755 index 086b391724..0000000000 --- a/.buildkite/scripts/postgres_exec.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python -# 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 sys - -import psycopg2 - -# a very simple replacment for `psql`, to make up for the lack of the postgres client -# libraries in the synapse docker image. - -# We use "postgres" as a database because it's bound to exist and the "synapse" one -# doesn't exist yet. -db_conn = psycopg2.connect( - user="postgres", host="postgres", password="postgres", dbname="postgres" -) -db_conn.autocommit = True -cur = db_conn.cursor() -for c in sys.argv[1:]: - cur.execute(c) diff --git a/.buildkite/scripts/test_synapse_port_db.sh b/.buildkite/scripts/test_synapse_port_db.sh deleted file mode 100755 index 82d7d56d4e..0000000000 --- a/.buildkite/scripts/test_synapse_port_db.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env bash -# -# Test script for 'synapse_port_db'. -# - sets up synapse and deps -# - runs the port script on a prepopulated test sqlite db -# - also runs it against an new sqlite db - - -set -xe -cd `dirname $0`/../.. - -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 test database" - -# 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. -./.buildkite/scripts/postgres_exec.py "CREATE DATABASE synapse" - -echo "+++ Run synapse_port_db against test database" -coverage run scripts/synapse_port_db --sqlite-database .buildkite/test_db.db --postgres-config .buildkite/postgres-config.yaml - -# We should be able to run twice against the same database. -echo "+++ Run synapse_port_db a second time" -coverage run scripts/synapse_port_db --sqlite-database .buildkite/test_db.db --postgres-config .buildkite/postgres-config.yaml - -##### - -# Now do the same again, on an empty database. - -echo "--- Prepare empty SQLite database" - -# we do this by deleting the sqlite db, and then doing the same again. -rm .buildkite/test_db.db - -scripts-dev/update_database --database-config .buildkite/sqlite-config.yaml - -# re-create the PostgreSQL database. -./.buildkite/scripts/postgres_exec.py \ - "DROP DATABASE synapse" \ - "CREATE DATABASE synapse" - -echo "+++ Run synapse_port_db against empty database" -coverage run scripts/synapse_port_db --sqlite-database .buildkite/test_db.db --postgres-config .buildkite/postgres-config.yaml diff --git a/.buildkite/sqlite-config.yaml b/.buildkite/sqlite-config.yaml deleted file mode 100644 index d16459cfd9..0000000000 --- a/.buildkite/sqlite-config.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# Configuration file used for testing the 'synapse_port_db' script. -# Tells the 'update_database' script to connect to the test SQLite database to upgrade its -# schema and run background updates on it. -server_name: "localhost:8800" - -signing_key_path: ".buildkite/test.signing.key" - -report_stats: false - -database: - name: "sqlite3" - args: - database: ".buildkite/test_db.db" - -# Suppress the key server warning. -trusted_key_servers: [] |