Move 32-bit CI testing from Debian 9 to Ubuntu 18.04.

Debian 9 will be EOL before our next release, so move 32-bit testing to Ubuntu 18.04, which is older than Debian 10.

.github/workflows/test.yml

@@ -29,10 +29,10 @@ jobs:
       matrix:
         include:
           # All unit tests (without coverage) for 32-bit
-          - param: test --vm=d9 --param=no-performance --param=c-only
+          - param: test --vm=u18 --param=no-performance --param=c-only
 
           # All integration tests for 32-bit
-          - param: test --vm=d9 --param=module=mock --param=module=real
+          - param: test --vm=u18 --param=module=mock --param=module=real
 
           # Debian/Ubuntu documentation
           - param: doc --vm=u18

test/container.yaml

@@ -12,9 +12,9 @@
 # - docker login -u pgbackrest
 # - VM=XXX;DATE=YYYYMMDDX;BASE=pgbackrest/test:${VM?}-base;docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?}
 # **********************************************************************************************************************************
-20220506A:
+20220512A:
   x86_64:
-    d9: 5af02d378de0f10edcfc86ea27aa8400b825d39b
+    u18: ab7da2bc87492aa0231b5014f05166cdeb9a3d30
 
 20220504A:
   x86_64:

test/lib/pgBackRestTest/Common/VmTest.pm

@@ -90,11 +90,9 @@ use constant VM_U18                                                 => 'u18';
     push @EXPORT, qw(VM_U18);
 use constant VM_U20                                                 => 'u20';
     push @EXPORT, qw(VM_U20);
-use constant VM_D9                                                  => 'd9';
-    push @EXPORT, qw(VM_D9);
 
 # VM aliases for run matrices (numbered oldest to newest)
-use constant VM2                                                    => VM_D9;
+use constant VM2                                                    => VM_U18;
     push @EXPORT, qw(VM2);
 use constant VM3                                                    => VM_RH7;
     push @EXPORT, qw(VM3);
@@ -186,38 +184,13 @@ my $oyVm =
         ],
     },
 
-    # Debian 9
-    &VM_D9 =>
-    {
-        &VM_OS_BASE => VM_OS_BASE_DEBIAN,
-        &VM_OS_REPO => 'stretch',
-        &VM_IMAGE => 'i386/debian:9',
-        &VM_ARCH => VM_ARCH_I386,
-        &VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin',
-
-        &VM_DB =>
-        [
-            PG_VERSION_90,
-            PG_VERSION_91,
-            PG_VERSION_92,
-        ],
-
-        &VM_DB_TEST =>
-        [
-            PG_VERSION_90,
-            PG_VERSION_91,
-            PG_VERSION_92,
-        ],
-    },
-
     # Ubuntu 18.04
     &VM_U18 =>
     {
         &VM_OS_BASE => VM_OS_BASE_DEBIAN,
         &VM_OS_REPO => 'bionic',
-        &VM_IMAGE => 'ubuntu:18.04',
+        &VM_IMAGE => 'i386/ubuntu:18.04',
-        &VM_ARCH => VM_ARCH_AMD64,
+        &VM_ARCH => VM_ARCH_I386,
-        &VMDEF_COVERAGE_C => true,
         &VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin',
 
         &VMDEF_WITH_BACKTRACE => true,
@@ -232,21 +205,14 @@ my $oyVm =
             PG_VERSION_94,
             PG_VERSION_95,
             PG_VERSION_96,
-            PG_VERSION_10,
-            PG_VERSION_11,
-            PG_VERSION_12,
-            PG_VERSION_13,
         ],
 
         &VM_DB_TEST =>
         [
+            PG_VERSION_90,
+            PG_VERSION_91,
+            PG_VERSION_92,
             PG_VERSION_93,
-            PG_VERSION_94,
-            PG_VERSION_95,
-            PG_VERSION_10,
-            PG_VERSION_11,
-            PG_VERSION_12,
-            PG_VERSION_13,
         ],
     },
 
@@ -282,7 +248,6 @@ my $oyVm =
 
         &VM_DB_TEST =>
         [
-            PG_VERSION_93,
             PG_VERSION_94,
             PG_VERSION_95,
             PG_VERSION_14,

test/src/module/common/ioTlsTest.c

@@ -649,14 +649,11 @@ testRun(void)
                 TEST_RESULT_STR_Z(ioServerName(tlsServer), "localhost", "tls server name");
 
                 // Invalid client cert
-                if (TEST_64BIT())                                   // Older 32-bit gives inconsistent results
-                {
                 socketSession = ioServerAccept(socketServer, NULL);
 
                 TEST_ERROR(
                     ioServerAccept(tlsServer, socketSession), ServiceError,
                     "TLS error [1:337100934] certificate verify failed");
-                }
 
                 // Valid client cert
                 socketSession = ioServerAccept(socketServer, NULL);
@@ -689,8 +686,6 @@ testRun(void)
             {
                 IoSession *clientSession = NULL;
 
-                if (TEST_64BIT())                                   // Older 32-bit gives inconsistent results
-                {
                 TEST_TITLE("client cert is invalid (signed by another CA)");
 
                 TEST_ASSIGN(
@@ -707,7 +702,6 @@ testRun(void)
                     "TLS error [1:336151576] tlsv1 alert unknown ca");
 
                 TEST_RESULT_VOID(ioSessionFree(clientSession), "free client session");
-                }
 
                 // -----------------------------------------------------------------------------------------------------------------
                 TEST_TITLE("client cert is valid");