db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-10-30 23:37:45 +02:00
Code Issues Releases Activity

Update user guide and tests to Ubuntu 22.04.

Browse Source 
20.04 is EOL so update the user guide and tests to 22.04.

The contributing guide was updated to 22.04 in d55836e7e.
This commit is contained in:
David Steele
2025-08-04 17:42:16 -04:00
parent 03cabe2644
commit fcd00a45f5
8 changed files with 22 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@@ -11,7 +11,7 @@ auto_cancellation: $CIRRUS_BRANCH != 'integration'
# ----------------------------------------------------------------------------------------------------------------------------------
# arm64_task:
# arm_container:
# image: ubuntu:20.04
# image: ubuntu:22.04
# cpu: 4
# memory: 2G

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

@@ -28,14 +28,11 @@ jobs:
# tackle the slowest tests first.
matrix:
include:
# All integration tests for oldest Debian
- param: test --vm=u20 --param=module=integration
# All tests (without coverage or valgrind) for 32-bit
- param: test --vm=d11 --param=no-performance --param=no-coverage --param=no-valgrind
# Debian/Ubuntu documentation
- param: doc --vm=u20
- param: doc --vm=u22
# All integration tests
- param: test --vm=u22 --param=build-package --param=module=integration

2
doc/release.pl
View File

@@ -248,7 +248,7 @@ eval
}
# Generate deployment docs for Debian
if (!defined($strVm) || $strVm eq VM_U20)
if (!defined($strVm) || $strVm eq VM_U22)
{
&log(INFO, "Generate Debian/Ubuntu documentation");

28
doc/xml/user-guide.xml
View File

@@ -36,7 +36,7 @@
<variable key="os-type-is-rhel">'{[os-type]}' eq '{[os-rhel]}'</variable>
<!-- Defines the container image that will be used to build the host -->
<variable key="os-image" if="{[os-type-is-debian]}">ubuntu:20.04</variable>
<variable key="os-image" if="{[os-type-is-debian]}">ubuntu:22.04</variable>
<variable key="os-image" if="{[os-type-is-rhel]}">rockylinux/rockylinux:8</variable>
<variable key="user-guide-subtitle" if="{[os-type-is-debian]}">{[os-debian-title]}</variable>
@@ -312,11 +312,13 @@
# Fix root tty
RUN sed -i 's/^mesg n/tty -s \&amp;\&amp; mesg n/g' /root/.profile
# Non-interactive install
ENV DEBIAN_FRONTEND=noninteractive
# Install base packages (suppress dpkg interactive output)
RUN export DEBIAN_FRONTEND=noninteractive &amp;&amp; \
rm /etc/apt/apt.conf.d/70debconf &amp;&amp; \
RUN rm /etc/apt/apt.conf.d/70debconf &amp;&amp; \
apt-get update &amp;&amp; \
apt-get install -y --no-install-recommends sudo ssh wget vim gnupg lsb-release iputils-ping ca-certificates \
apt-get install -y --no-install-recommends sudo ssh curl vim gnupg lsb-release iputils-ping ca-certificates \
tzdata locales libssh2-1-dev 2>&amp;1
{[sudo-disable-core-dump]}
@@ -324,19 +326,17 @@
# Install CA certificate
RUN update-ca-certificates
# Allow RSA keys in ssh
RUN echo 'PubkeyAcceptedAlgorithms +ssh-rsa' >> /etc/ssh/sshd_config
# Install PostgreSQL
RUN RELEASE_CODENAME=`lsb_release -c | awk '{print $2}'` &amp;&amp; \
echo 'deb http://apt.postgresql.org/pub/repos/apt/ '${RELEASE_CODENAME?}'-pgdg main' | \
tee -a /etc/apt/sources.list.d/pgdg.list &amp;&amp; \
wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add - &amp;&amp; \
apt-get update &amp;&amp; \
apt-get install -y --no-install-recommends postgresql-common 2>&amp;1 &amp;&amp; \
sed -i 's/^\#create\_main\_cluster.*$/create\_main\_cluster \= false/' \
/etc/postgresql-common/createcluster.conf &amp;&amp; \
apt-get install -y --no-install-recommends postgresql-{[pg-version]} postgresql-{[pg-version-upgrade]} 2>&amp;1
RUN apt-get install -y --no-install-recommends postgresql-common 2>&amp;1
RUN /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
RUN sed -i 's/^\#create\_main\_cluster.*$/create\_main\_cluster \= false/' /etc/postgresql-common/createcluster.conf
RUN apt-get install -y --no-install-recommends postgresql-{[pg-version]} postgresql-{[pg-version-upgrade]} 2>&amp;1
# Install Azure CLI
RUN apt-get install -y azure-cli
RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash
# Create an ssh key for root so all hosts can ssh to each other as root
RUN \ {[ssh-key-install]}

1
test/container.yaml
View File

@@ -34,4 +34,3 @@
x86_64:
d11: be044bf120ca3e7d8bed69d5a83b4de4926be87f
rh8: 4d141c845abfbdbf402ba447cf2bd2e4357c8a63
u20: d9618e4e2380da312152cf672ff56cfb8ec8abe2

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

@@ -438,7 +438,7 @@ sub containerBuild
" libbz2-dev bzip2 libyaml-dev libjson-pp-perl liblz4-dev liblz4-tool gnupg lsb-release ccache meson \\\n" .
" libssh2-1-dev libcurl4-openssl-dev";
if ($strOS eq VM_U20 || $strOS eq VM_U22)
if ($strOS eq VM_U22)
{
$strScript .= " valgrind";
}

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

@@ -85,13 +85,11 @@ use constant VM_RH8 => 'rh8';
push @EXPORT, qw(VM_RH8);
use constant VM_F42 => 'f42';
push @EXPORT, qw(VM_F42);
use constant VM_U20 => 'u20';
push @EXPORT, qw(VM_U20);
use constant VM_U22 => 'u22';
push @EXPORT, qw(VM_U22);
# List of default test VMs
use constant VM_LIST => (VM_U20, VM_D11, VM_RH8, VM_U22);
use constant VM_LIST => (VM_D11, VM_RH8, VM_U22);
push @EXPORT, qw(VM_LIST);
my $oyVm =
@@ -186,6 +184,7 @@ my $oyVm =
PG_VERSION_14,
PG_VERSION_15,
PG_VERSION_16,
PG_VERSION_17,
],
},
@@ -216,38 +215,6 @@ my $oyVm =
],
},
# Ubuntu 20.04
&VM_U20 =>
{
&VM_OS_BASE => VM_OS_BASE_DEBIAN,
&VM_IMAGE => 'ubuntu:20.04',
&VM_ARCH => VM_ARCH_X86_64,
&VMDEF_COVERAGE_C => true,
&VMDEF_PGSQL_BIN => '/usr/lib/postgresql/{[version]}/bin',
&VMDEF_WITH_ZST => true,
&VM_DB =>
[
PG_VERSION_95,
PG_VERSION_96,
PG_VERSION_10,
PG_VERSION_11,
PG_VERSION_12,
PG_VERSION_13,
PG_VERSION_14,
PG_VERSION_15,
PG_VERSION_16,
PG_VERSION_17,
],
&VM_DB_TEST =>
[
PG_VERSION_95,
PG_VERSION_96,
],
},
# Ubuntu 22.04
&VM_U22 =>
{
@@ -276,10 +243,11 @@ my $oyVm =
&VM_DB_TEST =>
[
PG_VERSION_95,
PG_VERSION_96,
PG_VERSION_10,
PG_VERSION_11,
PG_VERSION_12,
PG_VERSION_17,
PG_VERSION_18,
],
},

15
test/src/valgrind.suppress.none
View File

@@ -1,15 +0,0 @@
# Suppress issues in libssh2 on Ubuntu 20.04
{
libssh2_ubuntu_20_04
Memcheck:Addr1
...
obj:/usr/lib/x86_64-linux-gnu/libssh2.so.1.0.1
...
}
{
libssh2_ubuntu_20_04
Memcheck:Leak
...
obj:/usr/lib/x86_64-linux-gnu/libssh2.so.1.0.1
...
}