db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-11-06 08:49:29 +02:00
Code Issues Releases Activity

Update 32-bit CI host to Debian 10 from Ubuntu 18.04.

Browse Source 
Ubuntu 18.04 will be EOL before the next release, so update to the oldest available Debian version.

Also fix one incorrect return value type, a test cast, and adjust some test timeouts.
This commit is contained in:
David Steele
2023-04-06 08:22:14 +04:00
parent a9f39857cf
commit ff98636e41
9 changed files with 55 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
test/lib/pgBackRestTest/Common/VmTest.pm
View File

@@ -76,21 +76,21 @@ use constant VM_ALL => 'all';
use constant VM_NONE => 'none';
push @EXPORT, qw(VM_NONE);
use constant VM_D10 => 'd10';
push @EXPORT, qw(VM_D10);
use constant VM_RH7 => 'rh7';
push @EXPORT, qw(VM_RH7);
use constant VM_RH8 => 'rh8';
push @EXPORT, qw(VM_RH8);
use constant VM_F36 => 'f36';
push @EXPORT, qw(VM_F36);
use constant VM_U18 => 'u18';
push @EXPORT, qw(VM_U18);
use constant VM_U20 => 'u20';
push @EXPORT, qw(VM_U20);
use constant VM_U22 => 'u22';
push @EXPORT, qw(VM_U22);
# VM aliases for run matrices (numbered oldest to newest)
use constant VM2 => VM_U18;
use constant VM2 => VM_D10;
push @EXPORT, qw(VM2);
use constant VM3 => VM_RH7;
push @EXPORT, qw(VM3);
@@ -124,6 +124,31 @@ my $oyVm =
],
},
# Debian 10
&VM_D10 =>
{
&VM_OS_BASE => VM_OS_BASE_DEBIAN,
&VM_IMAGE => 'i386/debian:10',
&VM_ARCH => VM_ARCH_I386,
&VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin',
&VMDEF_WITH_ZST => true,
&VM_DB =>
[
PG_VERSION_93,
PG_VERSION_94,
PG_VERSION_95,
PG_VERSION_96,
],
&VM_DB_TEST =>
[
PG_VERSION_93,
PG_VERSION_94,
],
},
# RHEL 7
&VM_RH7 =>
{
@@ -181,31 +206,6 @@ my $oyVm =
],
},
# Ubuntu 18.04
&VM_U18 =>
{
&VM_OS_BASE => VM_OS_BASE_DEBIAN,
&VM_IMAGE => 'i386/ubuntu:18.04',
&VM_ARCH => VM_ARCH_I386,
&VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin',
&VMDEF_WITH_ZST => true,
&VM_DB =>
[
PG_VERSION_93,
PG_VERSION_94,
PG_VERSION_95,
PG_VERSION_96,
],
&VM_DB_TEST =>
[
PG_VERSION_93,
PG_VERSION_94,
],
},
# Ubuntu 20.04
&VM_U20 =>
{