db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2024-12-12 10:04:14 +02:00
Code Issues Releases Activity

Update Fedora test image to Fedora 40.

Browse Source
This commit is contained in:
David Steele 2024-05-18 18:55:53 +10:00
parent ffe9a17fcb
commit 28ad1badd9
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test.yml vendored
View File

@ -47,7 +47,7 @@ jobs:
- param: test --vm=u22 --param=c-only --param=no-coverage --param=no-back-trace
# All unit tests on the newest gcc available
- param: test --vm=f38 --param=c-only --param=no-valgrind --param=no-coverage --param=no-performance
- param: test --vm=f40 --param=c-only --param=no-valgrind --param=no-coverage --param=no-performance
# RHEL documentation
- param: doc --vm=rh8

5
test/container.yaml
View File

@ -12,6 +12,10 @@
# - docker login -u pgbackrest
# - VM=XXX;DATE=YYYYMMDDX;BASE=pgbackrest/test:${VM?}-base;docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?}
# **********************************************************************************************************************************
20240518A:
x86_64:
f40: 5173d773cfff925d4d41bd34029e55775be23c51
20240425A:
x86_64:
d10: fb03907abefd68fe16557b759e7e110e99eda748
@ -20,5 +24,4 @@
20240423A:
x86_64:
f38: 6f15d0dd72891c84b6ef5697cbe4b1c7e95c57cb
rh7: 3ba01dc5bbc96eed48287b8e4f52054d4d7030a5

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

@ -160,7 +160,7 @@ sub userCreate
if ($$oVm{$strOS}{&VM_OS_BASE} eq VM_OS_BASE_RHEL)
{
return "adduser -g${strGroup} -u${iId} -n ${strName}";
return "adduser -g${strGroup} -u${iId} -N ${strName}";
}
elsif ($$oVm{$strOS}{&VM_OS_BASE} eq VM_OS_BASE_DEBIAN)
{
@ -508,11 +508,11 @@ sub containerBuild
" https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-" . hostArch() . "/" .
"pgdg-redhat-repo-latest.noarch.rpm && \\\n";
}
elsif ($strOS eq VM_F38)
elsif ($strOS eq VM_F40)
{
$strScript .=
" rpm -ivh \\\n" .
" https://download.postgresql.org/pub/repos/yum/reporpms/F-38-" . hostArch() . "/" .
" https://download.postgresql.org/pub/repos/yum/reporpms/F-40-" . hostArch() . "/" .
"pgdg-fedora-repo-latest.noarch.rpm && \\\n";
}

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

@ -82,8 +82,8 @@ use constant VM_RH7 => 'rh7';
push @EXPORT, qw(VM_RH7);
use constant VM_RH8 => 'rh8';
push @EXPORT, qw(VM_RH8);
use constant VM_F38 => 'f38';
push @EXPORT, qw(VM_F38);
use constant VM_F40 => 'f40';
push @EXPORT, qw(VM_F40);
use constant VM_U20 => 'u20';
push @EXPORT, qw(VM_U20);
use constant VM_U22 => 'u22';
@ -179,11 +179,11 @@ my $oyVm =
],
},
# Fedora 38
&VM_F38 =>
# Fedora 40
&VM_F40 =>
{
&VM_OS_BASE => VM_OS_BASE_RHEL,
&VM_IMAGE => 'fedora:38',
&VM_IMAGE => 'fedora:40',
&VM_ARCH => VM_ARCH_AMD64,
&VMDEF_PGSQL_BIN => '/usr/pgsql-{[version]}/bin',
&VMDEF_COVERAGE_C => true,