db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-01-18 04:58:51 +02:00
Code Issues Releases Activity

New CI container build for PostgreSQL 17 beta1.

Browse Source 
Update the catalog version for beta 1 so pgbackrest will not work with any prior development versions.

Also improve the integration/all test so the catalog version does not need to be updated again during the beta period.
This commit is contained in:
David Steele 2024-05-24 12:24:11 +10:00
parent c401ae8fb8
commit 899b892788
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/postgres/interface/version.vendor.h
View File

@ -169,7 +169,7 @@ Types from src/include/catalog/catversion.h
*/
/* yyyymmddN */
#define CATALOG_VERSION_NO 202404021
#define CATALOG_VERSION_NO 202405161
#elif PG_VERSION >= PG_VERSION_16

5
test/container.yaml
View File

@ -12,6 +12,10 @@
# - docker login -u pgbackrest
# - VM=XXX;DATE=YYYYMMDDX;BASE=pgbackrest/test:${VM?}-base;docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?}
# **********************************************************************************************************************************
20240524A:
x86_64:
u22: eab8001bbbe7c610453ce06adb31ebd971c61592
20240518A:
x86_64:
f40: 5173d773cfff925d4d41bd34029e55775be23c51
@ -20,7 +24,6 @@
x86_64:
d10: fb03907abefd68fe16557b759e7e110e99eda748
u20: c3fc7cc1956c5eb10995119deed7a21b92dd07a7
u22: 11cead06a18450f45518b386181a4b7e8ffaf4c1
20240423A:
x86_64:

12
test/lib/pgBackRestTest/Common/ContainerTest.pm
View File

@ -522,14 +522,10 @@ sub containerBuild
{
$strScript .=
" echo \"deb http://apt.postgresql.org/pub/repos/apt/ \$(lsb_release -s -c)-pgdg main" .
"\" >> /etc/apt/sources.list.d/pgdg.list && \\\n" .
($strOS eq VM_U22 ?
" echo \"deb http://apt.postgresql.org/pub/repos/apt/ \$(lsb_release -s -c)-pgdg-snapshot main 17\"" .
" >> /etc/apt/sources.list.d/pgdg.list && \\\n" : '') .
($strOS eq VM_U22 ? ' 17' : '') . "\" >> /etc/apt/sources.list.d/pgdg.list && \\\n" .
" wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \\\n" .
" apt-get update && \\\n" .
" apt-get install -y --no-install-recommends" .
($strOS eq VM_U22 ? " -t \$(lsb_release -s -c)-pgdg-snapshot" : '') . " postgresql-common libpq-dev && \\\n" .
" apt-get install -y --no-install-recommends postgresql-common libpq-dev && \\\n" .
" sed -i 's/^\\#create\\_main\\_cluster.*\$/create\\_main\\_cluster \\= false/' " .
"/etc/postgresql-common/createcluster.conf";
}
@ -545,9 +541,7 @@ sub containerBuild
}
else
{
$strScript .=
" apt-get install -y --no-install-recommends" .
($strOS eq VM_U22 ? " -t \$(lsb_release -s -c)-pgdg-snapshot" : '');
$strScript .= " apt-get install -y --no-install-recommends";
}
# Construct list of databases to install

9
test/src/module/integration/allTest.c
View File

@ -88,6 +88,11 @@ testRun(void)
const unsigned int ts1Oid = pckReadU32P(hrnHostSqlValue(pg1, "select oid from pg_tablespace where spcname = 'ts1'"));
TEST_LOG_FMT("ts1 tablespace oid = %u", ts1Oid);
// Get the tablespace path to use for this version. We could use our internally stored catalog number but during the beta
// period this number will be changing and would need to be updated. Make this less fragile by just reading the path.
const String *const tablespacePath = strLstGet(
storageListP(hrnHostPgStorage(pg1), strNewFmt(PG_PATH_PGTBLSPC "/%u", ts1Oid)), 0);
// -------------------------------------------------------------------------------------------------------------------------
TEST_TITLE("check hosts (skip pg2 for now)");
{
@ -269,9 +274,7 @@ testRun(void)
const Buffer *const pgFileNodeMap = storageGetP(
storageNewReadP(
hrnHostPgStorage(pg1),
strNewFmt(
PG_PATH_PGTBLSPC "/%u/%s/%u/" PG_FILE_PGFILENODEMAP, ts1Oid,
strZ(pgTablespaceId(hrnHostPgVersion(), hrnPgCatalogVersion(hrnHostPgVersion()))), excludeMeOid)));
strNewFmt(PG_PATH_PGTBLSPC "/%u/%s/%u/" PG_FILE_PGFILENODEMAP, ts1Oid, strZ(tablespacePath), excludeMeOid)));
Buffer *const pgFileNodeMapZero = bufNew(bufUsed(pgFileNodeMap));
memset(bufPtr(pgFileNodeMapZero), 0, bufSize(pgFileNodeMapZero));

2
test/src/module/postgres/interfaceTest.c
View File

@ -238,7 +238,7 @@ testRun(void)
TEST_ASSIGN(info, pgControlFromFile(storageTest, NULL), "get control info");
TEST_RESULT_UINT(info.systemId, 0xEFEFEFEFEF, "check system id");
TEST_RESULT_UINT(info.version, PG_VERSION_17, "check version");
TEST_RESULT_UINT(info.catalogVersion, 202404021, "check catalog version");
TEST_RESULT_UINT(info.catalogVersion, 202405161, "check catalog version");
TEST_RESULT_UINT(info.checkpoint, 0xAABBAABBEEFFEEFF, "check checkpoint");
TEST_RESULT_UINT(info.timeline, 88, "check timeline");
TEST_RESULT_UINT(info.pageSize, pgPageSize32, "check page size");