Try running complement builds?

clokep · Oct 24, 2024 · 5353f8d · 5353f8d
1 parent 7ff4584
commit 5353f8d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 5 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -656,6 +656,9 @@ jobs:
           - arrangement: workers
             database: Postgres
 
+          - arrangement: workers
+            database: Psycopg
+
     steps:
       - name: Run actions/checkout@v4 for synapse
         uses: actions/checkout@v4
@@ -680,7 +683,7 @@ jobs:
           COMPLEMENT_DIR=`pwd`/complement synapse/scripts-dev/complement.sh -p 1 -json 2>&1 | synapse/.ci/scripts/gotestfmt
         shell: bash
         env:
-          POSTGRES: ${{ (matrix.database == 'Postgres') && 1 || '' }}
+          POSTGRES: ${{ (matrix.database == 'Postgres' || matrix.database == 'Psycopg') && matrix.database || '' }}
           WORKERS: ${{ (matrix.arrangement == 'workers') && 1 || '' }}
         name: Run Complement Tests
 

diff --git a/docker/complement/conf/start_for_complement.sh b/docker/complement/conf/start_for_complement.sh
@@ -23,6 +23,18 @@ export SYNAPSE_REPORT_STATS=no
 case "$SYNAPSE_COMPLEMENT_DATABASE" in
   postgres)
     # Set postgres authentication details which will be placed in the homeserver config file
+    export POSTGRES_DRIVER=psycopg2
+    export POSTGRES_PASSWORD=somesecret
+    export POSTGRES_USER=postgres
+    export POSTGRES_HOST=localhost
+
+    # configure supervisord to start postgres
+    export START_POSTGRES=true
+    ;;
+
+  psycopg)
+    # Set postgres authentication details which will be placed in the homeserver config file
+    export POSTGRES_DRIVER=psycopg
     export POSTGRES_PASSWORD=somesecret
     export POSTGRES_USER=postgres
     export POSTGRES_HOST=localhost

diff --git a/docker/conf/homeserver.yaml b/docker/conf/homeserver.yaml
@@ -57,11 +57,11 @@ listeners:
 
 {% if POSTGRES_PASSWORD %}
 database:
-  name: "psycopg2"
+  name: "{{ POSTGRES_DRIVER or "psycopg2" }}"
   args:
     user: "{{ POSTGRES_USER or "synapse" }}"
     password: "{{ POSTGRES_PASSWORD }}"
-    database: "{{ POSTGRES_DB or "synapse" }}"
+    dbname: "{{ POSTGRES_DB or "synapse" }}"
 {% if not SYNAPSE_USE_UNIX_SOCKET %}
 {# Synapse will use a default unix socket for Postgres when host/port is not specified (behavior from `psycopg2`). #}
     host: "{{ POSTGRES_HOST or "db" }}"

diff --git a/scripts-dev/complement.sh b/scripts-dev/complement.sh
@@ -246,7 +246,11 @@ if [[ -n "$WORKERS" ]]; then
   export PASS_SYNAPSE_WORKER_TYPES="$WORKER_TYPES"
 
   # Workers can only use Postgres as a database.
-  export PASS_SYNAPSE_COMPLEMENT_DATABASE=postgres
+  if [[ "$POSTGRES" = "psycopg" ]]; then
+    export PASS_SYNAPSE_COMPLEMENT_DATABASE=psycopg
+  else
+    export PASS_SYNAPSE_COMPLEMENT_DATABASE=postgres
+  fi
 
   # And provide some more configuration to complement.
 
@@ -256,7 +260,9 @@ if [[ -n "$WORKERS" ]]; then
   export COMPLEMENT_SPAWN_HS_TIMEOUT_SECS=120
 else
   export PASS_SYNAPSE_COMPLEMENT_USE_WORKERS=
-  if [[ -n "$POSTGRES" ]]; then
+  if [[ "$POSTGRES" = "psycopg" ]]; then
+    export PASS_SYNAPSE_COMPLEMENT_DATABASE=psycopg
+  elif [[ -n "$POSTGRES" ]]; then
     export PASS_SYNAPSE_COMPLEMENT_DATABASE=postgres
   else
     export PASS_SYNAPSE_COMPLEMENT_DATABASE=sqlite