1
0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-11-06 08:49:29 +02:00

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.
This commit is contained in:
David Steele
2022-05-12 11:57:12 -04:00
parent 24f138b067
commit 7d9b2e267c
4 changed files with 27 additions and 68 deletions

View File

@@ -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,