db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2026-06-03 19:24:32 +02:00
Code Issues Releases Activity

Remove CentOS 6 from tests and documentation.

Browse Source 
CentOS6 EOL'd and the mirrors were swiftly deleted, leading to failures in tests and documentation.

Remove CentOS 6 for now to get builds going again with the intention to replace it in the near future with CentOS 8.
This commit is contained in:
David Steele
2020-12-02 16:23:05 -05:00
parent ffc50719d9
commit ec9f23d31f
17 changed files with 20 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
-6
View File
@@ -30,9 +30,6 @@ jobs:
# All integration tests
- env: PGB_CI="test --vm=u18 --param=build-package --param=module=mock --param=module=real"
# All integration tests
- env: PGB_CI="test --vm=co6 --param=build-package --param=module=mock --param=module=real"
# Valgrind is disabled due to some platform-specific issues in getpwuid() and getgrgid() that do not seem to be pgBackRest bugs.
# Run in a different timezone to check time tests.
- arch: ppc64le
@@ -44,9 +41,6 @@ jobs:
# All unit tests (with coverage) on the newest gcc available
- env: PGB_CI="test --vm=f32 --param=c-only --param=no-performance"
# RHEL/CentOS 6 documentation
- env: PGB_CI=" doc --vm=co6"
# RHEL/CentOS 7 documentation
- env: PGB_CI=" doc --vm=co7"
doc/RELEASE.md
+2 -2
View File
@@ -77,7 +77,7 @@ Improvements:
Documentation Features:
* Add user guides for CentOS/RHEL 6/7.
* Add user guide for CentOS/RHEL 7.
```
Commit to integration with the above message and push to CI.
@@ -103,7 +103,7 @@ v2.14: Bug Fix and Improvements
**Documentation Features**:
- Add user guides for CentOS/RHEL 6/7.
- Add user guide for CentOS/RHEL 7.
```
The first line will be the release title and the rest will be the body. The tag field should be updated with the current version so a tag is created from master. **Be sure to select the release commit explicitly rather than auto-tagging the last commit in master!**
doc/release.pl
-21
View File
@@ -237,19 +237,6 @@ eval
}
}
# Generate deployment docs for RHEL/Centos 6
if (!defined($strVm) || $strVm eq VM_CO6)
{
&log(INFO, "Generate RHEL/CentOS 6 documentation");
executeTest("${strDocExe} --deploy --key-var=os-type=centos6 --out=html", {bShowOutputAsync => true});
if (!defined($strVm))
{
executeTest("${strDocExe} --deploy --cache-only --key-var=os-type=centos6 --out=html");
}
}
# Generate deployment docs for Debian
if (!defined($strVm) || $strVm eq VM_U18)
{
@@ -266,10 +253,6 @@ eval
executeTest(
"${strDocExe} --deploy --cache-only --key-var=os-type=centos7 --out=html --var=project-url-root=index.html");
$oStorageDoc->move("$strDocHtml/user-guide.html", "$strDocHtml/user-guide-centos7.html");
executeTest(
"${strDocExe} --deploy --out-preserve --cache-only --key-var=os-type=centos6 --out=html" .
" --var=project-url-root=index.html");
$oStorageDoc->move("$strDocHtml/user-guide.html", "$strDocHtml/user-guide-centos6.html");
executeTest(
"${strDocExe} --deploy --out-preserve --cache-only --out=man --out=html --var=project-url-root=index.html");
@@ -288,8 +271,6 @@ eval
executeTest("${strDocExeVersion} --key-var=os-type=centos7");
$oStorageDoc->move("$strDocHtml/user-guide.html", "$strDocHtml/user-guide-centos7.html");
executeTest("${strDocExeVersion} --out-preserve --key-var=os-type=centos6");
$oStorageDoc->move("$strDocHtml/user-guide.html", "$strDocHtml/user-guide-centos6.html");
$oStorageDoc->remove("$strDocHtml/release.html");
executeTest("${strDocExeVersion} --out-preserve --exclude=release");
@@ -307,8 +288,6 @@ eval
executeTest("${strDocExe} --deploy --cache-only --key-var=os-type=centos7 --out=html");
$oStorageDoc->move("$strDocHtml/user-guide.html", "$strDocHtml/user-guide-centos7.html");
executeTest("${strDocExe} --deploy --out-preserve --cache-only --key-var=os-type=centos6 --out=html");
$oStorageDoc->move("$strDocHtml/user-guide.html", "$strDocHtml/user-guide-centos6.html");
executeTest("${strDocExe} --deploy --out-preserve --cache-only --out=html");
# Deploy to repository
doc/xml/documentation.xml
+3 -9
View File
@@ -14,7 +14,7 @@
./doc.pl
</code-block>
<p>The user guide can be built for different platforms: <id>centos6</id>, <id>centos7</id>, and <id>debian</id>. This will build the HTML user guide for CentOS/RHEL 7:</p>
<p>The user guide can be built for different platforms: <id>centos7</id> and <id>debian</id>. This will build the HTML user guide for CentOS/RHEL 7:</p>
<code-block type="bash">
./doc.pl --out=html --include=user-guide --var=os-type=centos7
@@ -23,10 +23,10 @@
<p>Documentation generation will build a cache of all executed statements and use the cache to build the documentation quickly if no executed statements have changed. This makes proofing text-only edits very fast, but sometimes it is useful to do a full build without using the cache:</p>
<code-block type="bash">
./doc.pl --out=html --include=user-guide --var=os-type=centos6 --no-cache
./doc.pl --out=html --include=user-guide --var=os-type=centos7 --no-cache
</code-block>
<p>Each <id>os-type</id> has a default container image that will be used as a base for creating hosts. For <id>centos6</id>/<id>centos7</id> these defaults are generally fine, but for <id>debian</id> it can be useful to change the image.</p>
<p>Each <id>os-type</id> has a default container image that will be used as a base for creating hosts. For <id>centos7</id> these defaults are generally fine, but for <id>debian</id> it can be useful to change the image.</p>
<code-block type="bash">
./doc.pl --out=html --include=user-guide --var=os-type=debian --var=os-image=debian:9
@@ -72,12 +72,6 @@ sudo usermod -aG docker testdoc
./doc.pl --out=html --include=user-guide --no-cache --var=os-type=debian --var=os-image=ubuntu:16.04 --var=package=test/package/pgbackrest_2.08-0_amd64.deb
</code-block>
<p>CentOS/RHEL 6:</p>
<code-block type="bash">
./doc.pl --out=html --include=user-guide --no-cache --var=os-type=centos6 --var=package=test/package/pgbackrest-2.08-1.el6.x86_64.rpm
</code-block>
<p>CentOS/RHEL 7:</p>
<code-block type="bash">
doc/xml/user-guide-index.xml
-1
View File
@@ -9,7 +9,6 @@
<list>
<list-item><link url="user-guide.html">{[os-debian-title]} / PostgreSQL {[os-debian-pg-version-min]}-{[os-debian-pg-version-max]}</link></list-item>
<list-item><link url="user-guide-centos7.html">{[os-centos7-title]} / PostgreSQL {[os-centos7-pg-version-min]}-{[os-centos7-pg-version-max]}</link></list-item>
<list-item><link url="user-guide-centos6.html">{[os-centos6-title]} / PostgreSQL {[os-centos6-pg-version-min]}-{[os-centos6-pg-version-max]}</link></list-item>
</list>
</section>
</doc>
doc/xml/user-guide.xml
+2 -65
View File
@@ -7,12 +7,10 @@
<variable-list>
<!-- Defined OS types -->
<variable key="os-debian">debian</variable>
<variable key="os-centos6">centos6</variable>
<variable key="os-centos7">centos7</variable>
<!-- OS titles -->
<variable key="os-debian-title">Debian &amp; Ubuntu</variable>
<variable key="os-centos6-title">RHEL &amp; CentOS 6</variable>
<variable key="os-centos7-title">RHEL &amp; CentOS 7</variable>
<!-- Base PostgreSQL versions -->
@@ -20,10 +18,6 @@
<variable key="os-debian-pg-version-min">12</variable>
<variable key="os-debian-pg-version-max">13</variable>
<variable key="os-centos6-pg-version">9.5</variable>
<variable key="os-centos6-pg-version-min">9.2</variable>
<variable key="os-centos6-pg-version-max">9.5</variable>
<variable key="os-centos7-pg-version">10</variable>
<variable key="os-centos7-pg-version-min">9.6</variable>
<variable key="os-centos7-pg-version-max">11</variable>
@@ -31,7 +25,7 @@
<!-- User-defined package to use in documentation (use "apt" to install the current PGDG apt package) -->
<variable key="package">none</variable>
<!-- Defines the general OS type that will be used to generate commands. Also supported: centos6, centos7 -->
<!-- Defines the general OS type that will be used to generate commands. Also supported: centos7 -->
<variable key="os-type">debian</variable>
<!-- Will encryption be used in the documentation? It can be useful for testing to omit encryption. -->
@@ -39,21 +33,17 @@
<!-- Common if expressions for testing os-type -->
<variable key="os-type-is-debian">'{[os-type]}' eq '{[os-debian]}'</variable>
<variable key="os-type-is-centos6">'{[os-type]}' eq '{[os-centos6]}'</variable>
<variable key="os-type-is-centos7">'{[os-type]}' eq '{[os-centos7]}'</variable>
<variable key="os-type-is-centos">({[os-type-is-centos6]} || {[os-type-is-centos7]})</variable>
<variable key="os-type-is-centos">({[os-type-is-centos7]})</variable>
<!-- Defines the container image that will be used to build the host -->
<variable key="os-image" if="{[os-type-is-debian]}">ubuntu:16.04</variable>
<variable key="os-image" if="{[os-type-is-centos6]}">centos:6</variable>
<variable key="os-image" if="{[os-type-is-centos7]}">centos:7</variable>
<variable key="user-guide-subtitle" if="{[os-type-is-debian]}">{[os-debian-title]}</variable>
<variable key="user-guide-subtitle" if="{[os-type-is-centos6]}">{[os-centos6-title]}</variable>
<variable key="user-guide-subtitle" if="{[os-type-is-centos7]}">{[os-centos7-title]}</variable>
<variable key="user-guide-os" if="{[os-type-is-debian]}">Debian/Ubuntu</variable>
<variable key="user-guide-os" if="{[os-type-is-centos6]}">RHEL/CentOS 6</variable>
<variable key="user-guide-os" if="{[os-type-is-centos7]}">RHEL/CentOS 7</variable>
<variable key="pgbackrest-repo-path">/pgbackrest</variable>
@@ -71,10 +61,6 @@
<variable key="pg-version-min" if="{[os-type-is-debian]}">{[os-debian-pg-version-min]}</variable>
<variable key="pg-version-max" if="{[os-type-is-debian]}">{[os-debian-pg-version-max]}</variable>
<variable key="pg-version" if="{[os-type-is-centos6]}">{[os-centos6-pg-version]}</variable>
<variable key="pg-version-min" if="{[os-type-is-centos6]}">{[os-centos6-pg-version-min]}</variable>
<variable key="pg-version-max" if="{[os-type-is-centos6]}">{[os-centos6-pg-version-max]}</variable>
<variable key="pg-version" if="{[os-type-is-centos7]}">{[os-centos7-pg-version]}</variable>
<variable key="pg-version-min" if="{[os-type-is-centos7]}">{[os-centos7-pg-version-min]}</variable>
<variable key="pg-version-max" if="{[os-type-is-centos7]}">{[os-centos7-pg-version-max]}</variable>
@@ -86,7 +72,6 @@
<variable key="wal-level" if="{[pg-version]} &gt;= 9.6">replica</variable>
<variable key="pg-version-upgrade" if="{[os-type-is-debian]}">13</variable>
<variable key="pg-version-upgrade" if="{[os-type-is-centos6]}">9.6</variable>
<variable key="pg-version-upgrade" if="{[os-type-is-centos7]}">11</variable>
<variable key="pg-version-upgrade-nodot" eval="y">my $version = '{[pg-version-upgrade]}'; $version =~ s/\.//g; return $version;</variable>
@@ -226,31 +211,24 @@
<variable key="pg-cluster-create-upgrade" if="{[os-type-is-debian]}">pg_createcluster {[pg-version-upgrade]} {[postgres-cluster-demo]}</variable>
<variable key="pg-cluster-start" if="{[os-type-is-debian]}">pg_ctlcluster {[pg-version]} {[postgres-cluster-demo]} start</variable>
<variable key="pg-cluster-start" if="{[os-type-is-centos6]}">service postgresql-{[pg-version]} start</variable>
<variable key="pg-cluster-start" if="{[os-type-is-centos7]}">systemctl start postgresql-{[pg-version]}.service</variable>
<variable key="pg-cluster-start-upgrade" if="{[os-type-is-debian]}">pg_ctlcluster {[pg-version-upgrade]} {[postgres-cluster-demo]} start</variable>
<variable key="pg-cluster-start-upgrade" if="{[os-type-is-centos6]}">service postgresql-{[pg-version-upgrade]} start</variable>
<variable key="pg-cluster-start-upgrade" if="{[os-type-is-centos7]}">systemctl start postgresql-{[pg-version-upgrade]}.service</variable>
<variable key="pg-cluster-stop" if="{[os-type-is-debian]}">pg_ctlcluster {[pg-version]} {[postgres-cluster-demo]} stop</variable>
<variable key="pg-cluster-stop" if="{[os-type-is-centos6]}">service postgresql-{[pg-version]} stop</variable>
<variable key="pg-cluster-stop" if="{[os-type-is-centos7]}">systemctl stop postgresql-{[pg-version]}.service</variable>
<variable key="pg-cluster-restart" if="{[os-type-is-debian]}">pg_ctlcluster {[pg-version]} {[postgres-cluster-demo]} restart</variable>
<variable key="pg-cluster-restart" if="{[os-type-is-centos6]}">service postgresql-{[pg-version]} restart</variable>
<variable key="pg-cluster-restart" if="{[os-type-is-centos7]}">systemctl restart postgresql-{[pg-version]}.service</variable>
<variable key="pg-cluster-reload" if="{[os-type-is-debian]}">pg_ctlcluster {[pg-version]} {[postgres-cluster-demo]} reload</variable>
<variable key="pg-cluster-reload" if="{[os-type-is-centos6]}">service postgresql-{[pg-version]} reload</variable>
<variable key="pg-cluster-reload" if="{[os-type-is-centos7]}">systemctl reload postgresql-{[pg-version]}.service</variable>
<variable key="pg-cluster-check" if="{[os-type-is-debian]}">pg_lsclusters</variable>
<variable key="pg-cluster-check" if="{[os-type-is-centos6]}">service postgresql-{[pg-version]} status</variable>
<variable key="pg-cluster-check" if="{[os-type-is-centos7]}">systemctl status postgresql-{[pg-version]}.service</variable>
<variable key="pg-cluster-check-upgrade" if="{[os-type-is-debian]}">pg_lsclusters</variable>
<variable key="pg-cluster-check-upgrade" if="{[os-type-is-centos6]}">service postgresql-{[pg-version-upgrade]} status</variable>
<variable key="pg-cluster-check-upgrade" if="{[os-type-is-centos7]}">systemctl status postgresql-{[pg-version-upgrade]}.service</variable>
<!-- Add more tables to make the backup more interesting. This is a rough and ready solution that can be pasted into the
@@ -349,37 +327,6 @@
ENTRYPOINT service ssh restart &amp;&amp; bash
</host-define>
<host-define if="{[os-type-is-centos6]}" image="{[host-image]}" from="{[os-image]}">
{[copy-ca-cert]}
# Install packages
RUN yum install -y openssh-server openssh-clients sudo wget vim 2>&amp;1
{[sudo-disable-core-dump]}
# Install CA certificate
RUN update-ca-trust enable &amp;&amp; \
update-ca-trust extract
# Regenerate SSH keys
RUN rm -f /etc/ssh/ssh_host_rsa_key* &amp;&amp; \
ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key
# Install PostgreSQL
RUN rpm --import http://yum.postgresql.org/RPM-GPG-KEY-PGDG-10 &amp;&amp; \
rpm -ivh https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm &amp;&amp; \
yum install -y postgresql{[pg-version-nodot]}-server postgresql{[pg-version-upgrade-nodot]}-server
# Create an ssh key for root so all hosts can ssh to each other as root
RUN \ {[ssh-key-install]}
# Add doc user with sudo privileges
RUN adduser -n {[host-user]} &amp;&amp; \
echo '{[host-user]} ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/{[host-user]}
ENTRYPOINT /usr/sbin/sshd -D
</host-define>
<host-define if="{[os-type-is-centos7]}" image="{[host-image]}" from="{[os-image]}">
ENV container docker
@@ -1280,20 +1227,10 @@
<exe-highlight>could not find the database system</exe-highlight>
</execute>
<execute if="{[os-type-is-centos6]}" user="root" show="n">
<exe-cmd>rm -f {[postgres-log-pgstartup-demo]}</exe-cmd>
</execute>
<execute if="{[os-type-is-centos]}" user="root" err-expect="1">
<exe-cmd>{[pg-cluster-start]}</exe-cmd>
</execute>
<execute if="{[os-type-is-centos6]}" user="root" output="y">
<exe-cmd>cat {[postgres-log-pgstartup-demo]}</exe-cmd>
<exe-highlight-type>error</exe-highlight-type>
<exe-highlight>could not find the database system</exe-highlight>
</execute>
<execute if="{[os-type-is-centos7]}" user="root" output="y" err-expect="3">
<exe-cmd>{[pg-cluster-check]}</exe-cmd>
<exe-highlight>Failed to start PostgreSQL</exe-highlight>
test/container.yaml
-1
View File
@@ -13,7 +13,6 @@
# - VM=XXX;DATE=YYYYMMDDX;BASE=pgbackrest/test:${VM?}-base;docker tag ${BASE?} ${BASE?}-${DATE?} && docker push ${BASE?}-${DATE?}
# **********************************************************************************************************************************
20200924A:
co6: 111ea274130b051c4b82c16170eed997a9dc5d20
co7: ee58b885ad2463d60031511de0a297aa93c02068
u18: d95d53e642fc1cea4a2b8e935ea7d9739f7d1c46
test/lib/pgBackRestTest/Common/ContainerTest.pm
+3 -27
View File
@@ -244,12 +244,6 @@ sub certSetup
if ($rhVm->{$strOS}{&VM_OS_BASE} eq VM_OS_BASE_RHEL)
{
if ($strOS eq VM_CO6)
{
$strScript .=
" update-ca-trust enable && \\\n";
}
$strScript .=
" cp /etc/fake-cert/pgbackrest-test-ca.crt /etc/pki/ca-trust/source/anchors && \\\n" .
" update-ca-trust extract";
@@ -350,7 +344,7 @@ sub containerBuild
if ($$oVm{$strOS}{&VM_OS_BASE} eq VM_OS_BASE_RHEL)
{
if ($strOS eq VM_CO6 || $strOS eq VM_CO7)
if ($strOS eq VM_CO7)
{
$strScript .=
" yum -y install epel-release && \\\n";
@@ -361,16 +355,7 @@ sub containerBuild
" yum -y install openssh-server openssh-clients wget sudo valgrind git \\\n" .
" perl perl-Digest-SHA perl-DBD-Pg perl-YAML-LibYAML openssl \\\n" .
" gcc make perl-ExtUtils-MakeMaker perl-Test-Simple openssl-devel perl-ExtUtils-Embed rpm-build \\\n" .
" zlib-devel libxml2-devel lz4-devel lz4 bzip2-devel bzip2";
if ($strOS eq VM_CO6)
{
$strScript .= ' perl-Time-HiRes perl-parent perl-JSON';
}
else
{
$strScript .= ' perl-JSON-PP';
}
" zlib-devel libxml2-devel lz4-devel lz4 bzip2-devel bzip2 perl-JSON-PP";
}
else
{
@@ -475,16 +460,7 @@ sub containerBuild
$strScript .=
" rpm --import http://yum.postgresql.org/RPM-GPG-KEY-PGDG && \\\n";
if ($strOS eq VM_CO6)
{
$strScript .=
" rpm -ivh \\\n" .
" http://yum.postgresql.org/9.1/redhat/rhel-6-x86_64/pgdg-centos91-9.1-6.noarch.rpm \\\n" .
" http://yum.postgresql.org/9.2/redhat/rhel-6-x86_64/pgdg-centos92-9.2-8.noarch.rpm \\\n" .
" https://download.postgresql.org/pub/repos/yum/reporpms/EL-6-x86_64/" .
"pgdg-redhat-repo-latest.noarch.rpm && \\\n";
}
elsif ($strOS eq VM_CO7)
if ($strOS eq VM_CO7)
{
$strScript .=
" rpm -ivh \\\n" .
test/lib/pgBackRestTest/Common/JobTest.pm
+3 -4
View File
@@ -263,8 +263,7 @@ sub run
"rm -f test.gcda && " .
"make -j $self->{iBuildMax} -s 2>&1 &&" .
# Test with valgrind when requested
($self->{oTest}->{&TEST_VM} ne VM_CO6 && $self->{bValgrindUnit} &&
$self->{oTest}->{&TEST_TYPE} ne TESTDEF_PERFORMANCE ?
($self->{bValgrindUnit} && $self->{oTest}->{&TEST_TYPE} ne TESTDEF_PERFORMANCE ?
' valgrind -q --gen-suppressions=all ' .
($self->{oStorageTest}->exists($strValgrindSuppress) ? " --suppressions=${strValgrindSuppress}" : '') .
" --leak-check=full --leak-resolution=high --error-exitcode=25" : '') .
@@ -449,7 +448,7 @@ sub run
# Create build.auto.h
my $strBuildAutoH =
($self->{oTest}->{&TEST_VM} ne VM_CO6 ? "#define HAVE_STATIC_ASSERT\n" : '') .
"#define HAVE_STATIC_ASSERT\n" .
"#define HAVE_BUILTIN_TYPES_COMPATIBLE_P\n" .
(vmWithLz4($self->{oTest}->{&TEST_VM}) ? '#define HAVE_LIBLZ4' : '') . "\n" .
(vmWithZst($self->{oTest}->{&TEST_VM}) ? '#define HAVE_LIBZST' : '') . "\n";
@@ -491,7 +490,7 @@ sub run
(vmCoverageC($self->{oTest}->{&TEST_VM}) && $self->{bCoverageUnit} ? ' -DDEBUG_COVERAGE' : '') .
($self->{bDebug} ? '' : ' -DNDEBUG') .
($self->{bDebugTestTrace} && $self->{bDebug} ? ' -DDEBUG_TEST_TRACE' : '') .
($self->{oTest}->{&TEST_VM} eq VM_CO6 ? ' -DDEBUG_EXEC_TIME' : '');
($self->{oTest}->{&TEST_VM} eq VM_CO7 ? ' -DDEBUG_EXEC_TIME' : '');
# Flags used to build harness files
my $strHarnessFlags =
test/lib/pgBackRestTest/Common/VmTest.pm
+5 -37
View File
@@ -89,8 +89,6 @@ use constant VM_ALL => 'all';
use constant VM_NONE => 'none';
push @EXPORT, qw(VM_NONE);
use constant VM_CO6 => 'co6';
push @EXPORT, qw(VM_CO6);
use constant VM_CO7 => 'co7';
push @EXPORT, qw(VM_CO7);
use constant VM_F32 => 'f32';
@@ -117,8 +115,6 @@ use constant VM_HOST_DEFAULT => VM_U18;
push @EXPORT, qw(VM_HOST_DEFAULT);
# VM aliases for run matrices (numbered oldest to newest)
use constant VM1 => VM_CO6;
push @EXPORT, qw(VM1);
use constant VM2 => VM_U12;
push @EXPORT, qw(VM2);
use constant VM3 => VM_CO7;
@@ -127,7 +123,7 @@ use constant VM4 => VM_U18;
push @EXPORT, qw(VM4);
# List of default test VMs
use constant VM_LIST => (VM2, VM1, VM3, VM4);
use constant VM_LIST => (VM2, VM3, VM4);
push @EXPORT, qw(VM_LIST);
my $oyVm =
@@ -154,38 +150,6 @@ my $oyVm =
],
},
# CentOS 6
&VM_CO6 =>
{
&VM_OS_BASE => VM_OS_BASE_RHEL,
&VM_OS => VM_OS_CENTOS,
&VM_IMAGE => 'centos:6',
&VM_ARCH => VM_ARCH_AMD64,
&VMDEF_PGSQL_BIN => '/usr/pgsql-{[version]}/bin',
&VMDEF_WITH_ZST => true,
&VM_DB =>
[
PG_VERSION_91,
PG_VERSION_92,
PG_VERSION_95,
PG_VERSION_96,
PG_VERSION_10,
PG_VERSION_11,
PG_VERSION_12,
PG_VERSION_13,
],
&VM_DB_TEST =>
[
PG_VERSION_91,
PG_VERSION_92,
PG_VERSION_95,
PG_VERSION_10,
],
},
# CentOS 7
&VM_CO7 =>
{
@@ -328,6 +292,8 @@ my $oyVm =
PG_VERSION_83,
PG_VERSION_84,
PG_VERSION_90,
PG_VERSION_91,
PG_VERSION_92,
PG_VERSION_93,
],
},
@@ -431,6 +397,8 @@ my $oyVm =
&VM_DB_TEST =>
[
PG_VERSION_94,
PG_VERSION_95,
PG_VERSION_10,
PG_VERSION_11,
PG_VERSION_12,
PG_VERSION_13,
test/lib/pgBackRestTest/Env/Host/HostDbTest.pm
+1 -7
View File
@@ -474,16 +474,10 @@ sub clusterStop
$self->sqlDisconnect();
# Grep for errors in postgresql.log - this is done first because we want to ignore any errors that happen during shutdown.
#
# The unsupported version error is showing up on older versions of PostgreSQL (e.g. 9.1, 9.2) on RHEL6 when setting up a standby
# with streaming replication. The error occurs when a client does not properly send a version number and it's not clear why it
# is happening here, but it does not appear to have anything to do with pgBackRest and only affects RHEL6, i.e. 9.1 and 9.2
# do not show this error on other distros. For now ignore the error since RHEL6 is nearly EOL.
if (!$bIgnoreLogError && storageTest()->exists($self->pgLogFile()))
{
$self->executeSimple(
'grep -v "\(FATAL\: 57P03\: the database system is starting up"\)\|\(FATAL\: 0A000\: unsupported frontend protocol\)" ' .
$self->pgLogFile() . ' | grep "ERROR\|FATAL"',
'grep -v "FATAL\: 57P03\: the database system is starting up" ' . $self->pgLogFile() . ' | grep "ERROR\|FATAL"',
{iExpectedExitStatus => 1});
}
test/lib/pgBackRestTest/Module/Mock/MockAllTest.pm
-2
View File
@@ -205,8 +205,6 @@ sub run
foreach my $rhRun
(
{vm => VM1, remote => false, storage => S3, encrypt => false, delta => true, compress => LZ4},
{vm => VM1, remote => true, storage => POSIX, encrypt => true, delta => false, compress => BZ2},
{vm => VM2, remote => false, storage => POSIX, encrypt => false, delta => true, compress => BZ2},
{vm => VM2, remote => true, storage => AZURE, encrypt => true, delta => false, compress => GZ},
{vm => VM3, remote => false, storage => POSIX, encrypt => false, delta => true, compress => ZST},
test/lib/pgBackRestTest/Module/Mock/MockArchiveStopTest.pm
-2
View File
@@ -43,8 +43,6 @@ sub run
foreach my $rhRun
(
{vm => VM1, remote => false, storage => POSIX, encrypt => false, compress => LZ4, error => 0},
{vm => VM1, remote => true, storage => AZURE, encrypt => true, compress => GZ, error => 1},
{vm => VM2, remote => false, storage => S3, encrypt => false, compress => NONE, error => 0},
{vm => VM2, remote => true, storage => POSIX, encrypt => true, compress => BZ2, error => 0},
{vm => VM3, remote => false, storage => POSIX, encrypt => true, compress => NONE, error => 0},
test/lib/pgBackRestTest/Module/Mock/MockArchiveTest.pm
-2
View File
@@ -83,8 +83,6 @@ sub run
foreach my $rhRun
(
{vm => VM1, remote => false, storage => POSIX, encrypt => false, compress => GZ},
{vm => VM1, remote => true, storage => AZURE, encrypt => false, compress => LZ4},
{vm => VM2, remote => false, storage => S3, encrypt => true, compress => BZ2},
{vm => VM2, remote => true, storage => POSIX, encrypt => true, compress => BZ2},
{vm => VM3, remote => false, storage => POSIX, encrypt => true, compress => LZ4},
test/lib/pgBackRestTest/Module/Mock/MockExpireTest.pm
-1
View File
@@ -45,7 +45,6 @@ sub run
foreach my $rhRun
(
{vm => VM1, storage => POSIX, encrypt => false},
{vm => VM2, storage => S3, encrypt => true},
{vm => VM3, storage => POSIX, encrypt => false},
{vm => VM4, storage => AZURE, encrypt => true},
test/lib/pgBackRestTest/Module/Mock/MockStanzaTest.pm
-2
View File
@@ -41,8 +41,6 @@ sub run
foreach my $rhRun
(
{vm => VM1, remote => false, storage => POSIX, encrypt => true, compress => LZ4},
{vm => VM1, remote => true, storage => S3, encrypt => false, compress => BZ2},
{vm => VM2, remote => false, storage => AZURE, encrypt => true, compress => BZ2},
{vm => VM2, remote => true, storage => POSIX, encrypt => false, compress => GZ},
{vm => VM3, remote => false, storage => POSIX, encrypt => false, compress => ZST},
test/test.pl
+1 -1
View File
@@ -116,7 +116,7 @@ test.pl [options]
--quiet, -q equivalent to --log-level=off
VM Options:
--vm docker container to build/test (u12, u14, co6, co7)
--vm docker container to build/test (e.g. co7)
--vm-build build Docker containers
--vm-force force a rebuild of Docker containers
--vm-out Show VM output (default false)