From f0d7d847caa0d10022524c77689adbb46991d1f7 Mon Sep 17 00:00:00 2001 From: Zsolt Parragi Date: Thu, 27 Feb 2025 21:46:28 +0000 Subject: [PATCH] CI should execute correctly with wal encryption --- ci_scripts/configure-tde-server.sh | 2 +- ci_scripts/make-test-tde.sh | 2 ++ ci_scripts/tde_setup_global.sql | 1 - src/bin/pg_waldump/t/003_basic_encrypted.pl | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci_scripts/configure-tde-server.sh b/ci_scripts/configure-tde-server.sh index d79e6c1cad7..a5dfedd4c42 100644 --- a/ci_scripts/configure-tde-server.sh +++ b/ci_scripts/configure-tde-server.sh @@ -26,6 +26,6 @@ initdb -D "$PGDATA" --set shared_preload_libraries=pg_tde pg_ctl -D "$PGDATA" start -o "-p $PGPORT" -psql postgres -f "$SCRIPT_DIR/tde_setup_global.sql" +psql postgres -f "$SCRIPT_DIR/tde_setup_global.sql" -v ON_ERROR_STOP=on pg_ctl -D "$PGDATA" restart -o "-p $PGPORT" diff --git a/ci_scripts/make-test-tde.sh b/ci_scripts/make-test-tde.sh index 4fdc857efbd..3c873473101 100755 --- a/ci_scripts/make-test-tde.sh +++ b/ci_scripts/make-test-tde.sh @@ -1,5 +1,7 @@ #!/bin/bash +set -e + export TDE_MODE=1 SCRIPT_DIR="$(cd -- "$(dirname "$0")" >/dev/null 2>&1; pwd -P)" diff --git a/ci_scripts/tde_setup_global.sql b/ci_scripts/tde_setup_global.sql index 2906ebe6771..5b4a9629a63 100644 --- a/ci_scripts/tde_setup_global.sql +++ b/ci_scripts/tde_setup_global.sql @@ -3,7 +3,6 @@ CREATE EXTENSION IF NOT EXISTS pg_tde SCHEMA tde; SELECT tde.pg_tde_add_global_key_provider_file('reg_file-global', '/tmp/pg_tde_test_keyring.per'); SELECT tde.pg_tde_set_server_principal_key('global-principal-key', 'reg_file-global'); -SELECT tde.pg_tde_create_wal_key(); ALTER SYSTEM SET pg_tde.wal_encrypt = on; ALTER SYSTEM SET default_table_access_method = 'tde_heap'; ALTER SYSTEM SET search_path = "$user",public,tde; diff --git a/src/bin/pg_waldump/t/003_basic_encrypted.pl b/src/bin/pg_waldump/t/003_basic_encrypted.pl index 957decf71ad..1fd4fad129a 100644 --- a/src/bin/pg_waldump/t/003_basic_encrypted.pl +++ b/src/bin/pg_waldump/t/003_basic_encrypted.pl @@ -144,7 +144,7 @@ command_like( qr/./, 'runs with start and end segment specified'); command_fails_like( - [ 'pg_waldump', '-p', $node->data_dir ], + [ 'pg_waldump', '-p', $node->data_dir, '-k', $node->data_dir. '/pg_tde' ], qr/error: no start WAL location given/, 'path option requires start location'); command_like(