From 9ae3d8c46ac10273ca53c942410f768e27395230 Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Mon, 15 Oct 2018 23:13:08 +0100
Subject: [PATCH] Install nodejs from deb.nodesource.com.

The standard npm packages on Ubuntu 18.04 suddenly required libssl1.0 which broke the pgbackrest package builds. Installing nodejs from deb.nodesource.com seems to work fine with standard libssl.

This package is required by ScalityS3 which is used for local S3 testing.
---
 doc/xml/release.xml                             | 4 ++++
 test/container.yaml                             | 4 ++--
 test/lib/pgBackRestTest/Common/ContainerTest.pm | 6 +-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/xml/release.xml b/doc/xml/release.xml
index a9b911470..5ed5562e2 100644
--- a/doc/xml/release.xml
+++ b/doc/xml/release.xml
@@ -191,6 +191,10 @@
 
             <release-test-list>
                 <release-development-list>
+                    <release-item>
+                        <p>Install <proper>nodejs</proper> from <id>deb.nodesource.com</id>.</p>
+                    </release-item>
+
                     <release-item>
                         <p>Disable flapping <id>archive/get</id> unit on CentOS 6.</p>
                     </release-item>
diff --git a/test/container.yaml b/test/container.yaml
index 275566752..a05198f92 100644
--- a/test/container.yaml
+++ b/test/container.yaml
@@ -13,8 +13,8 @@
 # - docker tag pgbackrest/test:{vm}-base pgbackrest/test:{vm}-base-YYYYMMDDA
 # - docker push pgbackrest/test:{vm}-base-YYYYMMDDA
 # **********************************************************************************************************************************
-20180921A:
-  u18: 5e966399a1352880e5bb97a35cda162766da0409
+20181015A:
+  u18: a821a0dcf42db4a6e101ff2b27d8903b8b534fe6
 
 20180721A:
   co6: 0ce34e42667499721f9f02c1b9e886f5f331b4e4
diff --git a/test/lib/pgBackRestTest/Common/ContainerTest.pm b/test/lib/pgBackRestTest/Common/ContainerTest.pm
index 8fe293ba3..158dbdae4 100755
--- a/test/lib/pgBackRestTest/Common/ContainerTest.pm
+++ b/test/lib/pgBackRestTest/Common/ContainerTest.pm
@@ -298,12 +298,8 @@ sub s3ServerSetup
         $strScript .=
             "    wget -O /root/nodejs.sh https://deb.nodesource.com/setup_6.x && \\\n" .
             "    bash /root/nodejs.sh && \\\n" .
+            "    wget -qO- https://deb.nodesource.com/setup_8.x | bash - && \\\n" .
             "    apt-get install -y nodejs";
-
-        if ($strOS eq VM_U18)
-        {
-            $strScript .= ' npm';
-        }
     }
 
     # Install Scality S3