Finalize catalog number for PostgreSQL 15 release.

pgbackrest · Oct 15, 2022 · 65be4c6 · 65be4c6
1 parent ea162e8
commit 65be4c6
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 6 deletions.
diff --git a/src/build/postgres/postgres.yaml b/src/build/postgres/postgres.yaml
@@ -17,5 +17,4 @@ version:
   - 12
   - 13
   - 14
-  - 15:
-      release: false
+  - 15
diff --git a/src/postgres/interface/version.vendor.h b/src/postgres/interface/version.vendor.h
@@ -191,7 +191,7 @@ Types from src/include/catalog/catversion.h
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	202204076
+#define CATALOG_VERSION_NO	202209061
 
 #elif PG_VERSION >= PG_VERSION_14
 

diff --git a/test/container.yaml b/test/container.yaml
@@ -12,10 +12,13 @@
 # - docker login -u pgbackrest
 # - VM=XXX;DATE=YYYYMMDDX;BASE=pgbackrest/test:${VM?}-base;docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?}
 # **********************************************************************************************************************************
+20221016A:
+  x86_64:
+    u22: eacdfcf2c094e2dadb02fb0828516e14a96facd0
+
 20220726A:
   x86_64:
     f36: 099b329ca7988b05f2cb8ef759e146ea9faab108
     rh7: 6072f05804b369681efad5cebe01704cb9d2a81a
     u18: 7cf94d338a8d399f15eb551977a00a7db8e5b879
     u20: f5b22e94c4bac5589e92977a3edd52507f8fa150
-    u22: a1a0e9f6f96a75d4212c347a746d137306056606
diff --git a/test/lib/pgBackRestTest/Common/ContainerTest.pm b/test/lib/pgBackRestTest/Common/ContainerTest.pm
@@ -506,7 +506,7 @@ sub containerBuild
             {
                 $strScript .=
                     "    echo \"deb http://apt.postgresql.org/pub/repos/apt/ \$(lsb_release -s -c)-pgdg main" .
-                        ($strOS eq VM_U20 || $strOS eq VM_U22 ? ' 15' : '') . "\" >> /etc/apt/sources.list.d/pgdg.list && \\\n" .
+                        "\" >> /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 postgresql-common libpq-dev && \\\n" .

diff --git a/test/lib/pgBackRestTest/Env/HostEnvTest.pm b/test/lib/pgBackRestTest/Env/HostEnvTest.pm
@@ -253,7 +253,7 @@ sub dbCatalogVersion
         &PG_VERSION_12 => 201909212,
         &PG_VERSION_13 => 202007201,
         &PG_VERSION_14 => 202105121,
-        &PG_VERSION_15 => 202204076,
+        &PG_VERSION_15 => 202209061,
     };
 
     if (!defined($hCatalogVersion->{$strPgVersion}))