Skip to content

Commit ee8b09f

Browse files
committed
chore: add release suffix for testing
1 parent 6794909 commit ee8b09f

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

ansible/vars.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ postgres_major:
1010

1111
# Full version strings for each major version
1212
postgres_release:
13-
postgresorioledb-17: 17.5.1.036-orioledb
14-
postgres17: 17.6.1.015
15-
postgres15: 15.14.1.015
13+
postgresorioledb-17: 17.5.1.036-orioledb-pgaudit-1
14+
postgres17: 17.6.1.015-pgaudit-1
15+
postgres15: 15.14.1.015-pgaudit-1
1616

1717
# Non Postgres Extensions
1818
pgbouncer_release: 1.19.0

nix/ext/tests/pgaudit.nix

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ self.inputs.nixpkgs.lib.nixos.runTest {
112112
pg17-configuration = "${nodes.server.system.build.toplevel}/specialisation/postgresql17";
113113
in
114114
''
115+
from pathlib import Path
115116
versions = {
116117
"15": [${lib.concatStringsSep ", " (map (s: ''"${s}"'') (versions "15"))}],
117118
"17": [${lib.concatStringsSep ", " (map (s: ''"${s}"'') (versions "17"))}],
@@ -122,6 +123,8 @@ self.inputs.nixpkgs.lib.nixos.runTest {
122123
ext_has_background_worker = ${
123124
if (installedExtension "15") ? hasBackgroundWorker then "True" else "False"
124125
}
126+
sql_test_directory = Path("${../../tests}")
127+
pg_regress_test_name = "${(installedExtension "15").pgRegressTestName or pname}"
125128
126129
${builtins.readFile ./lib.py}
127130
@@ -130,11 +133,14 @@ self.inputs.nixpkgs.lib.nixos.runTest {
130133
server.wait_for_unit("multi-user.target")
131134
server.wait_for_unit("postgresql.service")
132135
133-
test = PostgresExtensionTest(server, extension_name, versions, support_upgrade)
136+
test = PostgresExtensionTest(server, extension_name, versions, sql_test_directory, support_upgrade)
134137
135138
with subtest("Check upgrade path with postgresql 15"):
136139
test.check_upgrade_path("15")
137140
141+
with subtest("Check pg_regress with postgresql 15"):
142+
test.check_pg_regress(Path("${psql_15}/lib/pgxs/src/test/regress/pg_regress"), "15", pg_regress_test_name)
143+
138144
last_version = None
139145
with subtest("Check the install of the last version of the extension"):
140146
last_version = test.check_install_last_version("15")
@@ -149,5 +155,8 @@ self.inputs.nixpkgs.lib.nixos.runTest {
149155
150156
with subtest("Check upgrade path with postgresql 17"):
151157
test.check_upgrade_path("17")
158+
159+
with subtest("Check pg_regress with postgresql 17"):
160+
test.check_pg_regress(Path("${psql_17}/lib/pgxs/src/test/regress/pg_regress"), "17", pg_regress_test_name)
152161
'';
153162
}

0 commit comments

Comments
 (0)