Update 32-bit test container to Debian 9.

Also rebalance PostgreSQL version integration tests.

.github/workflows/test.yml

@@ -29,7 +29,7 @@ jobs:
       matrix:
         include:
           # All unit (without coverage) and integration tests for 32-bit
-          - param: test --vm=u16 --param=no-performance
+          - param: test --vm=d9 --param=no-performance
 
           # Debian/Ubuntu documentation
           - param: doc --vm=u18

src/common/io/tls/client.c

@@ -379,7 +379,7 @@ tlsClientNew(IoClient *ioClient, const String *host, TimeMSec timeout, bool veri
         memContextCallbackSet(objMemContext(driver), tlsClientFreeResource, driver);
 
         // Exclude SSL versions to only allow TLS and also disable compression
-        SSL_CTX_set_options(driver->context, (long)(SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION));
+        SSL_CTX_set_options(driver->context, SSL_OP_ALL | SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3 | SSL_OP_NO_COMPRESSION);
 
         // Disable auto-retry to prevent SSL_read() from hanging
         SSL_CTX_clear_mode(driver->context, SSL_MODE_AUTO_RETRY);

test/container.yaml

@@ -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?}
 # **********************************************************************************************************************************
+20211016A:
+  x86_64:
+    d9: 3a0ed45fd9115f9612767e7bd13564608d1f8f83
+
 20210930A:
   x86_64:
     u20: 7ffb73ceb9a2e3aad2cba7eb5c8e28fc3982db18
@@ -20,7 +24,6 @@
   x86_64:
     co7: c4d02428812374ab6a22efa437499592ae9c5f08
     f33: 04b3353c5fcc859c9df528e2fa78e6ed73c6390b
-    u16: 3c872cddfdf2534e32c074dfae1ec25295237b5c
 
 20210901A:
   aarch64:

test/lib/pgBackRestTest/Common/VmTest.pm

@@ -96,14 +96,10 @@ use constant VM_CO8                                                 => 'co8';
     push @EXPORT, qw(VM_CO8);
 use constant VM_F33                                                 => 'f33';
     push @EXPORT, qw(VM_F33);
-use constant VM_U16                                                 => 'u16';
-    push @EXPORT, qw(VM_U16);
 use constant VM_U18                                                 => 'u18';
     push @EXPORT, qw(VM_U18);
 use constant VM_U20                                                 => 'u20';
     push @EXPORT, qw(VM_U20);
-use constant VM_D8                                                  => 'd8';
-    push @EXPORT, qw(VM_D8);
 use constant VM_D9                                                  => 'd9';
     push @EXPORT, qw(VM_D9);
 
@@ -112,7 +108,7 @@ use constant VM_EXPECT                                              => VM_CO7;
     push @EXPORT, qw(VM_EXPECT);
 
 # VM aliases for run matrices (numbered oldest to newest)
-use constant VM2                                                    => VM_U16;
+use constant VM2                                                    => VM_D9;
     push @EXPORT, qw(VM2);
 use constant VM3                                                    => VM_CO7;
     push @EXPORT, qw(VM3);
@@ -203,76 +199,16 @@ my $oyVm =
         ],
     },
 
-    # Debian 8
-    &VM_D8 =>
-    {
-        &VM_OS_BASE => VM_OS_BASE_DEBIAN,
-        &VM_OS => VM_OS_DEBIAN,
-        &VM_OS_REPO => 'jessie',
-        &VM_IMAGE => 'debian:8',
-        &VM_ARCH => VM_ARCH_AMD64,
-        &VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin',
-
-        &VM_DB =>
-        [
-            PG_VERSION_84,
-            PG_VERSION_90,
-            PG_VERSION_91,
-            PG_VERSION_92,
-            PG_VERSION_93,
-            PG_VERSION_94,
-            PG_VERSION_95,
-            PG_VERSION_96,
-            PG_VERSION_10,
-            PG_VERSION_11,
-        ],
-
-        &VM_DB_TEST =>
-        [
-            PG_VERSION_95,
-        ],
-    },
-
     # Debian 9
     &VM_D9 =>
     {
         &VM_OS_BASE => VM_OS_BASE_DEBIAN,
         &VM_OS => VM_OS_DEBIAN,
         &VM_OS_REPO => 'stretch',
-        &VM_IMAGE => 'debian:9',
-        &VM_ARCH => VM_ARCH_AMD64,
-        &VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin',
-
-        &VM_DB_TEST =>
-        [
-            PG_VERSION_92,
-            PG_VERSION_93,
-            PG_VERSION_94,
-            PG_VERSION_95,
-            PG_VERSION_96,
-            PG_VERSION_10,
-            PG_VERSION_11,
-            PG_VERSION_12,
-        ],
-
-        &VM_DB_TEST =>
-        [
-            PG_VERSION_96,
-        ],
-    },
-
-    # Ubuntu 16.04
-    &VM_U16 =>
-    {
-        &VM_OS_BASE => VM_OS_BASE_DEBIAN,
-        &VM_OS => VM_OS_UBUNTU,
-        &VM_OS_REPO => 'xenial',
-        &VM_IMAGE => 'i386/ubuntu:16.04',
+        &VM_IMAGE => 'i386/debian:9',
         &VM_ARCH => VM_ARCH_I386,
         &VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin',
 
-        &VMDEF_WITH_BACKTRACE => true,
-
         &VM_DB =>
         [
             PG_VERSION_83,
@@ -280,14 +216,6 @@ my $oyVm =
             PG_VERSION_90,
             PG_VERSION_91,
             PG_VERSION_92,
-            PG_VERSION_93,
-            PG_VERSION_94,
-            PG_VERSION_95,
-            PG_VERSION_96,
-            PG_VERSION_10,
-            PG_VERSION_11,
-            PG_VERSION_12,
-            PG_VERSION_13,
         ],
 
         &VM_DB_TEST =>
@@ -295,8 +223,6 @@ my $oyVm =
             PG_VERSION_83,
             PG_VERSION_84,
             PG_VERSION_90,
-            PG_VERSION_91,
-            PG_VERSION_92,
         ],
     },
 
@@ -375,6 +301,8 @@ my $oyVm =
 
         &VM_DB_TEST =>
         [
+            PG_VERSION_91,
+            PG_VERSION_92,
             PG_VERSION_93,
             PG_VERSION_94,
             PG_VERSION_95,

test/src/valgrind.suppress.u16

@@ -1,7 +0,0 @@
-# Newer versions do not have this leak
-{
-    ignore_libcrypto_leaks
-    Memcheck:Leak
-    ...
-    obj:*/libcrypto.so*
-}