From 3e695af9614e61f72e9f0d7c3dc729cc5a27f3eb Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Thu, 8 Nov 2018 21:41:41 -0500
Subject: [PATCH] New test containers.

* Add libxml2 library needed for S3 development.
* Minor version updates for PostgreSQL.
* Remove PostgreSQL 11 beta/rc repository.
---
 doc/xml/release.xml                             |  4 ++++
 test/Vagrantfile                                |  3 ++-
 test/container.yaml                             | 12 +++++-------
 test/lib/pgBackRestTest/Common/ContainerTest.pm |  7 ++++---
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index c8dc3b84c..0d18656fb 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -122,6 +122,10 @@
 
             <release-test-list>
                 <release-development-list>
+                    <release-item>
+                        <p>New test containers.  Add libxml2 library needed for S3 development.  Include new minor version upgrades for <postgres/>.  Remove <postgres/> 11 beta/rc repository.</p>
+                    </release-item>
+
                     <release-item>
                         <p>Test speed improvements.  Mount <id>tmpfs</id> in <file>Vagrantfile</file> instead <file>test.pl</file>.  Preserve contents of C unit test build directory between <file>test.pl</file> executions.  Improve efficiency of code generation.</p>
                     </release-item>
diff --git a/test/Vagrantfile b/test/Vagrantfile
index 89e88e225..a387163ab 100644
--- a/test/Vagrantfile
+++ b/test/Vagrantfile
@@ -60,7 +60,8 @@ Vagrant.configure(2) do |config|
 
         #---------------------------------------------------------------------------------------------------------------------------
         echo 'Install Build Tools' && date
-        apt-get install -y devscripts build-essential lintian git txt2man debhelper libssl-dev zlib1g-dev libperl-dev lcov cloc
+        apt-get install -y devscripts build-essential lintian git lcov cloc txt2man debhelper libssl-dev zlib1g-dev libperl-dev \
+             libxml2-dev
 
         #---------------------------------------------------------------------------------------------------------------------------
         echo 'Install AWS CLI' && date
diff --git a/test/container.yaml b/test/container.yaml
index a05198f92..d54f30336 100644
--- a/test/container.yaml
+++ b/test/container.yaml
@@ -13,10 +13,8 @@
 # - docker tag pgbackrest/test:{vm}-base pgbackrest/test:{vm}-base-YYYYMMDDA
 # - docker push pgbackrest/test:{vm}-base-YYYYMMDDA
 # **********************************************************************************************************************************
-20181015A:
-  u18: a821a0dcf42db4a6e101ff2b27d8903b8b534fe6
-
-20180721A:
-  co6: 0ce34e42667499721f9f02c1b9e886f5f331b4e4
-  co7: 58b1f8e80553ea197d54c6b51479d29029a0468d
-  u12: 6892bee5d0584c45d12273f687230fbec0b27982
+20181108A:
+  u18: 06d378758d6e2f797457578039201a27c9344979
+  co6: ea59b548f8590edf6873f6c1b32d6a232bf7e1ee
+  co7: 7ce2337eeddd433b6ca9400a9c99ce444981c938
+  u12: 60f8591b9dd33a25720d3eefe3e9f39bf2884bc4
diff --git a/test/lib/pgBackRestTest/Common/ContainerTest.pm b/test/lib/pgBackRestTest/Common/ContainerTest.pm
index 158dbdae4..ef9762c90 100755
--- a/test/lib/pgBackRestTest/Common/ContainerTest.pm
+++ b/test/lib/pgBackRestTest/Common/ContainerTest.pm
@@ -407,7 +407,8 @@ sub containerBuild
                 "    yum -y update && \\\n" .
                 "    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 zlib-devel";
+                "        gcc make perl-ExtUtils-MakeMaker perl-Test-Simple openssl-devel perl-ExtUtils-Embed rpm-build \\\n" .
+                "        zlib-devel libxml2-devel";
 
             if ($strOS eq VM_CO6)
             {
@@ -434,7 +435,7 @@ sub containerBuild
                 "    apt-get -y install openssh-server wget sudo python-pip build-essential valgrind git \\\n" .
                 "        libdbd-pg-perl libhtml-parser-perl libio-socket-ssl-perl libxml-libxml-perl libssl-dev libperl-dev \\\n" .
                 "        libyaml-libyaml-perl tzdata devscripts lintian libxml-checker-perl txt2man debhelper \\\n" .
-                "        libppi-html-perl libtemplate-perl libtest-differences-perl zlib1g-dev";
+                "        libppi-html-perl libtemplate-perl libtest-differences-perl zlib1g-dev libxml2-dev";
 
             if ($strOS eq VM_U12)
             {
@@ -521,7 +522,7 @@ sub containerBuild
             {
                 $strScript .=
                     "    echo 'deb http://apt.postgresql.org/pub/repos/apt/ " .
-                    $$oVm{$strOS}{&VM_OS_REPO} . '-pgdg main' . ($strOS ne VM_U12 ? ' 11' : '') .
+                    $$oVm{$strOS}{&VM_OS_REPO} . '-pgdg main' .
                         "' >> /etc/apt/sources.list.d/pgdg.list && \\\n" .
                     "    wget --quiet -O - https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \\\n" .
                     "    apt-get update && \\\n" .