Skip to content
Permalink
Browse files

Update test containers with PostgreSQL minor releases and liblz4.

Update RHEL repos that have changed upstream.  Remove PostgreSQL 9.3 since the RHEL6/7 packages have disappeared.

Remove PostgreSQL versions from U12 that are still getting minor updates so the container does not need to be rebuilt.

LZ4 is included for future development, but this seems like a good time to add it to the containers.
  • Loading branch information...
dwsteele committed Apr 24, 2019
1 parent 1ae8a6a commit 3505559a808855600016dc73c5aec3843e51bfaf
@@ -89,6 +89,10 @@
<p>Add <code>harnessInfoChecksum/Z()</code> to ease creation of test info files.</p>
</release-item>

<release-item>
<p>Update containers with <postgres/> minor releases and <id>liblz4</id>.</p>
</release-item>

<release-item>
<p>Add <id>build-max</id> option to set max build processes.</p>
</release-item>
@@ -61,7 +61,7 @@ Vagrant.configure(2) do |config|
#---------------------------------------------------------------------------------------------------------------------------
echo 'Install Build Tools' && date
apt-get install -y devscripts build-essential lintian git lcov cloc txt2man debhelper libssl-dev zlib1g-dev libperl-dev \
libxml2-dev
libxml2-dev liblz4-dev
#---------------------------------------------------------------------------------------------------------------------------
echo 'Install AWS CLI' && date
@@ -115,6 +115,8 @@ Vagrant.configure(2) do |config|
#---------------------------------------------------------------------------------------------------------------------------
# Force remove all containers:
# docker rm -f $(docker ps -a -q)
# Force remove all images:
# docker rmi -f $(docker images -q)
SHELL

# Don't share the default vagrant folder
@@ -13,8 +13,8 @@
# - docker tag pgbackrest/test:{vm}-base pgbackrest/test:{vm}-base-YYYYMMDDA
# - docker push pgbackrest/test:{vm}-base-YYYYMMDDA
# **********************************************************************************************************************************
20181121A:
u18: e62cd73d8e20f0bc25a1b3c4fd2bd3520ee196b3
co6: a7836f34b8053bc7656676c0b188b1893bc41186
co7: 72b99963f7bdf7b1b9d617239149d9c583819887
u12: d36f0ea1ff557524bc80e02d2a25daf287ebce64
20190424A:
u18: 72f9a453557e21dd3269b8b3fba1b4b8d6dc9d77
co6: 27a1efc146c200ad7592575808443bd086cf3e0d
co7: 5816e9219e7b5fb188331021c82559f9062de8b0
u12: 20b1b60cf8f456c03dc8ebadaf7d264fe1d9f957
@@ -436,7 +436,7 @@ sub containerBuild
" yum -y install openssh-server openssh-clients wget sudo python-pip build-essential valgrind git \\\n" .
" perl perl-Digest-SHA perl-DBD-Pg perl-XML-LibXML perl-IO-Socket-SSL perl-YAML-LibYAML \\\n" .
" gcc make perl-ExtUtils-MakeMaker perl-Test-Simple openssl-devel perl-ExtUtils-Embed rpm-build \\\n" .
" zlib-devel libxml2-devel";
" zlib-devel libxml2-devel lz4-devel";

if ($strOS eq VM_CO6)
{
@@ -469,6 +469,10 @@ sub containerBuild
{
$strScript .= ' libperl5.14';
}
else
{
$strScript .= ' liblz4-dev';
}

if (vmLintC($strOS))
{
@@ -535,26 +539,20 @@ sub containerBuild
if ($strOS eq VM_CO6)
{
$strScript .=
" rpm --import http://yum.postgresql.org/RPM-GPG-KEY-PGDG-10 && \\\n" .
" rpm -ivh \\\n" .
" http://yum.postgresql.org/9.0/redhat/rhel-6-x86_64/pgdg-centos90-9.0-5.noarch.rpm \\\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" .
" http://yum.postgresql.org/9.3/redhat/rhel-6-x86_64/pgdg-centos93-9.3-3.noarch.rpm \\\n" .
" http://yum.postgresql.org/9.4/redhat/rhel-6-x86_64/pgdg-centos94-9.4-3.noarch.rpm \\\n" .
" http://yum.postgresql.org/9.5/redhat/rhel-6-x86_64/pgdg-centos95-9.5-3.noarch.rpm \\\n" .
" http://yum.postgresql.org/9.6/redhat/rhel-6-x86_64/pgdg-centos96-9.6-3.noarch.rpm \\\n" .
" http://yum.postgresql.org/10/redhat/rhel-6-x86_64/pgdg-centos10-10-2.noarch.rpm";
" https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-6-x86_64/pgdg-redhat-repo-latest.noarch.rpm";
}
elsif ($strOS eq VM_CO7)
{
$strScript .=
" rpm --import http://yum.postgresql.org/RPM-GPG-KEY-PGDG-10 && \\\n" .
" rpm -ivh \\\n" .
" http://yum.postgresql.org/9.2/redhat/rhel-7-x86_64/pgdg-centos92-9.2-3.noarch.rpm \\\n" .
" http://yum.postgresql.org/9.3/redhat/rhel-7-x86_64/pgdg-centos93-9.3-3.noarch.rpm \\\n" .
" http://yum.postgresql.org/9.4/redhat/rhel-7-x86_64/pgdg-centos94-9.4-3.noarch.rpm \\\n" .
" http://yum.postgresql.org/9.5/redhat/rhel-7-x86_64/pgdg-centos95-9.5-3.noarch.rpm \\\n" .
" http://yum.postgresql.org/9.6/redhat/rhel-7-x86_64/pgdg-centos96-9.6-3.noarch.rpm \\\n" .
" http://yum.postgresql.org/10/redhat/rhel-7-x86_64/pgdg-centos10-10-2.noarch.rpm";
" https://download.postgresql.org/pub/repos/yum/11/redhat/rhel-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm";
}
}
else
@@ -140,7 +140,6 @@ my $oyVm =
PG_VERSION_90,
PG_VERSION_91,
PG_VERSION_92,
PG_VERSION_93,
PG_VERSION_94,
PG_VERSION_95,
PG_VERSION_96,
@@ -171,7 +170,6 @@ my $oyVm =
&VM_DB =>
[
PG_VERSION_92,
PG_VERSION_93,
PG_VERSION_94,
PG_VERSION_95,
PG_VERSION_96,
@@ -262,9 +260,6 @@ my $oyVm =
PG_VERSION_91,
PG_VERSION_92,
PG_VERSION_93,
PG_VERSION_94,
PG_VERSION_95,
PG_VERSION_96,
],

&VM_DB_TEST =>

0 comments on commit 3505559

Please sign in to comment.
You can’t perform that action at this time.