From 7d9b2e267c3f68463000cfcfec6018cc12203f23 Mon Sep 17 00:00:00 2001 From: David Steele Date: Thu, 12 May 2022 11:57:12 -0400 Subject: [PATCH] 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 | 4 +- test/container.yaml | 4 +- test/lib/pgBackRestTest/Common/VmTest.pm | 47 +++--------------------- test/src/module/common/ioTlsTest.c | 40 +++++++++----------- 4 files changed, 27 insertions(+), 68 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a79b1f3ea..b5d937e10 100644 --- a/.github/workflows/test.yml +++ b/.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 diff --git a/test/container.yaml b/test/container.yaml index f374d736b..846a69d54 100644 --- a/test/container.yaml +++ b/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: diff --git a/test/lib/pgBackRestTest/Common/VmTest.pm b/test/lib/pgBackRestTest/Common/VmTest.pm index 781b7c678..0805c5131 100644 --- a/test/lib/pgBackRestTest/Common/VmTest.pm +++ b/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_ARCH => VM_ARCH_AMD64, - &VMDEF_COVERAGE_C => true, + &VM_IMAGE => 'i386/ubuntu:18.04', + &VM_ARCH => VM_ARCH_I386, &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, diff --git a/test/src/module/common/ioTlsTest.c b/test/src/module/common/ioTlsTest.c index 0dbf962b9..a8f8c668a 100644 --- a/test/src/module/common/ioTlsTest.c +++ b/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); + socketSession = ioServerAccept(socketServer, NULL); - TEST_ERROR( - ioServerAccept(tlsServer, socketSession), ServiceError, - "TLS error [1:337100934] certificate verify failed"); - } + TEST_ERROR( + ioServerAccept(tlsServer, socketSession), ServiceError, + "TLS error [1:337100934] certificate verify failed"); // Valid client cert socketSession = ioServerAccept(socketServer, NULL); @@ -689,25 +686,22 @@ 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_TITLE("client cert is invalid (signed by another CA)"); - TEST_ASSIGN( - clientSession, - ioClientOpen( - tlsClientNewP( - sckClientNew(STRDEF("127.0.0.1"), hrnServerPort(0), 5000, 5000), STRDEF("127.0.0.1"), 5000, 5000, - true, .certFile = STRDEF(TEST_PATH "/client-bad-ca.crt"), - .keyFile = STRDEF(HRN_SERVER_CLIENT_KEY))), - "client open"); + TEST_ASSIGN( + clientSession, + ioClientOpen( + tlsClientNewP( + sckClientNew(STRDEF("127.0.0.1"), hrnServerPort(0), 5000, 5000), STRDEF("127.0.0.1"), 5000, 5000, + true, .certFile = STRDEF(TEST_PATH "/client-bad-ca.crt"), + .keyFile = STRDEF(HRN_SERVER_CLIENT_KEY))), + "client open"); - TEST_ERROR( - ioRead(ioSessionIoReadP(clientSession), bufNew(1)), ServiceError, - "TLS error [1:336151576] tlsv1 alert unknown ca"); + TEST_ERROR( + ioRead(ioSessionIoReadP(clientSession), bufNew(1)), ServiceError, + "TLS error [1:336151576] tlsv1 alert unknown ca"); - TEST_RESULT_VOID(ioSessionFree(clientSession), "free client session"); - } + TEST_RESULT_VOID(ioSessionFree(clientSession), "free client session"); // ----------------------------------------------------------------------------------------------------------------- TEST_TITLE("client cert is valid");