db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-09-16 09:06:18 +02:00
Code Issues Releases Activity

Remove RHEL package patch now that it has been merged upstream.

Browse Source 
Also revert 731ffcfb and update ContainerTest.pm for upstream changes.
This commit is contained in:
David Steele
2020-01-21 11:57:59 -07:00
parent b89e6b7f69
commit 03d434c7e1
3 changed files with 7 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@@ -15,10 +15,10 @@ matrix:
include:
- env: PGB_CI="test --vm=u12"
- env: PGB_CI="test --vm=f30 --param=no-package --param=c-only"
- env: PGB_CI="test --vm=co6 --param=no-package --param=module=mock --param=module=real"
- env: PGB_CI="test --vm=co6 --param=module=mock --param=module=real"
- env: PGB_CI="test --vm=u18 --param=container-only"
- env: PGB_CI=" doc --vm=u18"
- env: PGB_CI="test --vm=co7 --param=no-package --param=module=mock --param=module=real"
- env: PGB_CI="test --vm=co7 --param=module=mock --param=module=real"
- dist: bionic
env:
- PGB_CI="test --vm=none --param=tz=America/New_York"

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

@@ -566,12 +566,17 @@ sub containerBuild
}
else
{
# Fetching specific files is fragile but even a shallow clone of the entire pgrpms repo is very expensive. Using
# 'git archive' does not seem to work: access denied or repository not exported: /git/pgrpms.git.
$strScript .= sectionHeader() .
"# Install pgBackRest package source\n" .
" mkdir /root/package-src && \\\n" .
" wget -O /root/package-src/pgbackrest-conf.patch " .
"'https://git.postgresql.org/gitweb/?p=pgrpms.git;a=blob_plain;" .
"f=rpm/redhat/master/pgbackrest/master/pgbackrest-conf.patch;hb=refs/heads/master' && \\\n" .
" wget -O /root/package-src/pgbackrest-libxmlinclude.patch " .
"'https://git.postgresql.org/gitweb/?p=pgrpms.git;a=blob_plain;" .
"f=rpm/redhat/master/pgbackrest/master/pgbackrest-libxmlinclude.patch;hb=refs/heads/master' && \\\n" .
" wget -O /root/package-src/pgbackrest.spec " .
"'https://git.postgresql.org/gitweb/?p=pgrpms.git;a=blob_plain;" .
"f=rpm/redhat/master/pgbackrest/master/pgbackrest.spec;hb=refs/heads/master'";

20
test/patch/rhel-package.patch
View File

@@ -1,20 +0,0 @@
--- pgbackrest.spec
+++ pgbackrest.spec
@@ -8,16 +8,7 @@
Url: http://www.pgbackrest.org/
Source0: https://github.com/pgbackrest/pgbackrest/archive/release/%{version}.tar.gz
Source1: pgbackrest-conf.patch
-Requires: perl-XML-LibXML perl-IO-Socket-SSL
-%if 0%{?rhel} && 0%{?rhel} <= 6
-Requires: perl-parent perl-JSON perl-Time-HiRes
-%else
-Requires: perl-JSON-PP
-%endif
-Requires: perl-Digest-SHA perl-DBD-Pg perl-Time-HiRes zlib
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-BuildRequires: openssl-devel zlib-devel perl-ExtUtils-Embed
-BuildRequires: postgresql%{pgmajorversion}-devel
+BuildRequires: openssl-devel zlib-devel postgresql%{pgmajorversion}-devel
Requires: postgresql-libs