db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-15 01:04:37 +02:00
Code Issues Releases Activity

Use 'x86_64' instead of 'amd64' for container testing.

Browse Source 
This aligns with what is reported by 'uname -m' and required by Docker naming conventions.

Also convert a 'aarch64' string to the VM_ARCH_AARCH64 constant.
This commit is contained in:
David Steele
2025-05-09 12:56:57 -04:00
parent 7786b5d847
commit 34b916f323
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
test/lib/pgBackRestTest/Common/ContainerTest.pm
View File

@ -384,8 +384,9 @@ sub containerBuild
# Base image # Base image
########################################################################################################################### ###########################################################################################################################
my $strImageParent = my $strImageParent =
(defined($strArch) ? "${strArch}/" : (vmArch($strOS) eq VM_ARCH_AMD64 ? '' : vmArch($strOS) . '/')) . (defined($strArch) ? "${strArch}/" : (vmArch($strOS) eq VM_ARCH_X86_64 ? '' : vmArch($strOS) . '/')) .
"$$oVm{$strOS}{&VM_IMAGE}"; "$$oVm{$strOS}{&VM_IMAGE}";
$strArch = defined($strArch) ? $strArch : VM_ARCH_X86_64;
my $strImage = "${strOS}-base" . (defined($strArch) ? "-${strArch}" : '-' . hostArch()); my $strImage = "${strOS}-base" . (defined($strArch) ? "-${strArch}" : '-' . hostArch());
my $strCopy = undef; my $strCopy = undef;

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

@ -63,8 +63,8 @@ use constant VM_ARCH_AARCH64 => 'aarch64'
push @EXPORT, qw(VM_ARCH_AARCH64); push @EXPORT, qw(VM_ARCH_AARCH64);
use constant VM_ARCH_I386 => 'i386'; use constant VM_ARCH_I386 => 'i386';
push @EXPORT, qw(VM_ARCH_I386); push @EXPORT, qw(VM_ARCH_I386);
use constant VM_ARCH_AMD64 => 'amd64'; use constant VM_ARCH_X86_64 => 'x86_64';
push @EXPORT, qw(VM_ARCH_AMD64); push @EXPORT, qw(VM_ARCH_X86_64);
#################################################################################################################################### ####################################################################################################################################
# Valid VM list # Valid VM list
@ -96,7 +96,7 @@ my $oyVm =
&VM_NONE => &VM_NONE =>
{ {
&VM_OS_BASE => VM_OS_BASE_DEBIAN, &VM_OS_BASE => VM_OS_BASE_DEBIAN,
&VM_ARCH => VM_ARCH_AMD64, &VM_ARCH => VM_ARCH_X86_64,
&VMDEF_COVERAGE_C => true, &VMDEF_COVERAGE_C => true,
&VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin', &VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin',
@ -140,7 +140,7 @@ my $oyVm =
{ {
&VM_OS_BASE => VM_OS_BASE_RHEL, &VM_OS_BASE => VM_OS_BASE_RHEL,
&VM_IMAGE => 'rockylinux/rockylinux:8', &VM_IMAGE => 'rockylinux/rockylinux:8',
&VM_ARCH => VM_ARCH_AMD64, &VM_ARCH => VM_ARCH_X86_64,
&VMDEF_PGSQL_BIN => '/usr/pgsql-{[version]}/bin', &VMDEF_PGSQL_BIN => '/usr/pgsql-{[version]}/bin',
&VMDEF_DEBUG_INTEGRATION => false, &VMDEF_DEBUG_INTEGRATION => false,
@ -168,7 +168,7 @@ my $oyVm =
{ {
&VM_OS_BASE => VM_OS_BASE_RHEL, &VM_OS_BASE => VM_OS_BASE_RHEL,
&VM_IMAGE => 'fedora:41', &VM_IMAGE => 'fedora:41',
&VM_ARCH => VM_ARCH_AMD64, &VM_ARCH => VM_ARCH_X86_64,
&VMDEF_PGSQL_BIN => '/usr/pgsql-{[version]}/bin', &VMDEF_PGSQL_BIN => '/usr/pgsql-{[version]}/bin',
&VMDEF_COVERAGE_C => true, &VMDEF_COVERAGE_C => true,
@ -195,7 +195,7 @@ my $oyVm =
{ {
&VM_OS_BASE => VM_OS_BASE_DEBIAN, &VM_OS_BASE => VM_OS_BASE_DEBIAN,
&VM_IMAGE => 'ubuntu:20.04', &VM_IMAGE => 'ubuntu:20.04',
&VM_ARCH => VM_ARCH_AMD64, &VM_ARCH => VM_ARCH_X86_64,
&VMDEF_COVERAGE_C => true, &VMDEF_COVERAGE_C => true,
&VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin', &VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin',
@ -227,7 +227,7 @@ my $oyVm =
{ {
&VM_OS_BASE => VM_OS_BASE_DEBIAN, &VM_OS_BASE => VM_OS_BASE_DEBIAN,
&VM_IMAGE => 'ubuntu:22.04', &VM_IMAGE => 'ubuntu:22.04',
&VM_ARCH => VM_ARCH_AMD64, &VM_ARCH => VM_ARCH_X86_64,
&VMDEF_COVERAGE_C => true, &VMDEF_COVERAGE_C => true,
&VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin', &VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin',
@ -419,7 +419,7 @@ sub hostArch
# Mac M1 reports arm64 but we generally need aarch64 (which Linux reports) # Mac M1 reports arm64 but we generally need aarch64 (which Linux reports)
if ($strHostArch eq 'arm64') if ($strHostArch eq 'arm64')
{ {
$strHostArch = 'aarch64'; $strHostArch = VM_ARCH_AARCH64;
} }
} }