Finalize catalog number for PostgreSQL 14 release.

src/postgres/interface/version.vendor.h

@@ -197,10 +197,7 @@ Types from src/include/catalog/catversion.h
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	202105121
-
-// Allow the catalog version to float during the PostgreSQL 14 beta/rc period
-#define CATALOG_VERSION_NO_MAX
+#define CATALOG_VERSION_NO	202107181
 
 #elif PG_VERSION >= PG_VERSION_13
 

test/container.yaml

@@ -12,12 +12,15 @@
 # - docker login -u pgbackrest
 # - VM=XXX;DATE=YYYYMMDDX;BASE=pgbackrest/test:${VM?}-base;docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?}
 # **********************************************************************************************************************************
+20210930A:
+  x86_64:
+    u20: 7ffb73ceb9a2e3aad2cba7eb5c8e28fc3982db18
+
 20210902A:
   x86_64:
     co7: c4d02428812374ab6a22efa437499592ae9c5f08
     f33: 04b3353c5fcc859c9df528e2fa78e6ed73c6390b
     u16: 3c872cddfdf2534e32c074dfae1ec25295237b5c
-    u20: d81b5a7e496290710c4dbef7a7f07ae60ae9619f
 
 20210901A:
   aarch64:

test/lib/pgBackRestTest/Common/ContainerTest.pm

@@ -497,8 +497,7 @@ sub containerBuild
             {
                 $strScript .=
                     "    echo 'deb http://apt.postgresql.org/pub/repos/apt/ " .
-                    $$oVm{$strOS}{&VM_OS_REPO} . '-pgdg main' . ($strOS eq VM_U20 ? ' 14' : '') .
-                        "' >> /etc/apt/sources.list.d/pgdg.list && \\\n" .
+                    $$oVm{$strOS}{&VM_OS_REPO} . '-pgdg main' . "' >> /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" .