From c9481bb95f1edaa93b26f8fce767950e00b40543 Mon Sep 17 00:00:00 2001
From: David Steele <david@pgmasters.net>
Date: Tue, 14 Apr 2020 14:51:14 -0400
Subject: [PATCH] Update contributing.xml to use Ubuntu 18.04.

Ubuntu 19.04 was EOL in January and has been removed from the repository servers.

It may be best to stick to LTS versions from now on.
---
 CONTRIBUTING.md          | 18 +++++++++---------
 doc/xml/contributing.xml | 12 ++++++------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 91c10715b..9191f313e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ This documentation is intended to assist contributors to pgBackRest by outlining
 
 ## Building a Development Environment
 
-This example is based on Ubuntu 19.04, but it should work on many versions of Debian and Ubuntu.
+This example is based on Ubuntu 18.04, but it should work on many versions of Debian and Ubuntu.
 
 pgbackrest-dev => Install development tools
 ```
@@ -119,23 +119,23 @@ pgbackrest/test/test.pl --vm=none --dev --module=postgres
 
 ### With Docker
 
-Build a container to run tests. The vm must be pre-configured but a variety are available. The vm names are all three character abbreviations, e.g. `u19` for Ubuntu 19.04.
+Build a container to run tests. The vm must be pre-configured but a variety are available. The vm names are all three character abbreviations, e.g. `u18` for Ubuntu 18.04.
 
 pgbackrest-dev => Build a VM
 ```
-pgbackrest/test/test.pl --vm-build --vm=u19
+pgbackrest/test/test.pl --vm-build --vm=u18
 
 --- output ---
 
     P00   INFO: test begin - log level info
-    P00   INFO: Using cached pgbackrest/test:u19-base-20200310A image (9eb97f565e47a76e98743c98a862f91e8df5e2b1) ...
-    P00   INFO: Building pgbackrest/test:u19-test image ...
+    P00   INFO: Using cached pgbackrest/test:u18-base-20200310A image (5e295130131d5fe96e2483885c171677b52c8ce3) ...
+    P00   INFO: Building pgbackrest/test:u18-test image ...
     P00   INFO: Build Complete
 ```
 
 pgbackrest-dev => Run a Test
 ```
-pgbackrest/test/test.pl --vm=u19 --dev --module=mock --test=archive --run=2
+pgbackrest/test/test.pl --vm=u18 --dev --module=mock --test=archive --run=2
 
 --- output ---
 
@@ -143,13 +143,13 @@ pgbackrest/test/test.pl --vm=u19 --dev --module=mock --test=archive --run=2
     P00   INFO: check code autogenerate
     P00   INFO: cleanup old data and containers
     P00   INFO: builds required: bin, bin host
-    P00   INFO:     bin dependencies have changed for u19, rebuilding...
-    P00   INFO:     build bin for u19 (/home/vagrant/test/bin/u19)
+    P00   INFO:     bin dependencies have changed for u18, rebuilding...
+    P00   INFO:     build bin for u18 (/home/vagrant/test/bin/u18)
     P00   INFO:     bin dependencies have changed for none, rebuilding...
     P00   INFO:     build bin for none (/home/vagrant/test/bin/none)
     P00   INFO: 1 test selected
                 
-    P00   INFO: P1-T1/1 - vm=u19, module=mock, test=archive, run=2
+    P00   INFO: P1-T1/1 - vm=u18, module=mock, test=archive, run=2
     P00   INFO: no code modules had all tests run required for coverage
     P00   INFO: writing C coverage report
     P00   INFO: TESTS COMPLETED SUCCESSFULLY
diff --git a/doc/xml/contributing.xml b/doc/xml/contributing.xml
index 820386ecd..b1acf9801 100644
--- a/doc/xml/contributing.xml
+++ b/doc/xml/contributing.xml
@@ -19,7 +19,7 @@
     </variable-list>
 
     <!-- Setup hosts used to build the documentation =========================================================================== -->
-    <host-define if="{[os-type-is-debian]}" image="{[host-contrib-image]}" from="ubuntu:19.04">
+    <host-define if="{[os-type-is-debian]}" image="{[host-contrib-image]}" from="ubuntu:18.04">
         {[copy-ca-cert]}
 
         # Fix root tty
@@ -52,9 +52,9 @@
     <section id="environment">
         <title>Building a Development Environment</title>
 
-        <p>This example is based on <proper>Ubuntu 19.04</proper>, but it should work on many versions of <proper>Debian</proper> and <proper>Ubuntu</proper>.</p>
+        <p>This example is based on <proper>Ubuntu 18.04</proper>, but it should work on many versions of <proper>Debian</proper> and <proper>Ubuntu</proper>.</p>
 
-        <host-add id="{[host-contrib-id]}" name="{[host-contrib]}" user="{[host-contrib-user]}" image="{[host-contrib-image]}" os="u19" option="-v /var/run/docker.sock:/var/run/docker.sock -v {[cwd]}/test:{[cwd]}/test" mount="/home/{[host-contrib-user]}/pgbackrest:/home/{[host-contrib-user]}/pgbackrest"/>
+        <host-add id="{[host-contrib-id]}" name="{[host-contrib]}" user="{[host-contrib-user]}" image="{[host-contrib-image]}" os="u18" option="-v /var/run/docker.sock:/var/run/docker.sock -v {[cwd]}/test:{[cwd]}/test" mount="/home/{[host-contrib-user]}/pgbackrest:/home/{[host-contrib-user]}/pgbackrest"/>
 
         <execute-list host="{[host-contrib]}">
             <title>Install development tools</title>
@@ -150,13 +150,13 @@
         <section id="with-docker" depend="/environment">
             <title>With Docker</title>
 
-            <p>Build a container to run tests.  The vm must be pre-configured but a variety are available.  The vm names are all three character abbreviations, e.g. <id>u19</id> for <proper>Ubuntu 19.04</proper>.</p>
+            <p>Build a container to run tests.  The vm must be pre-configured but a variety are available.  The vm names are all three character abbreviations, e.g. <id>u18</id> for <proper>Ubuntu 18.04</proper>.</p>
 
             <execute-list host="{[host-contrib]}">
                 <title>Build a VM</title>
 
                 <execute output="y">
-                    <exe-cmd>pgbackrest/test/test.pl --vm-build --vm=u19</exe-cmd>
+                    <exe-cmd>pgbackrest/test/test.pl --vm-build --vm=u18</exe-cmd>
                     <exe-cmd-extra>{[test-cmd-extra]}</exe-cmd-extra>
                 </execute>
             </execute-list>
@@ -165,7 +165,7 @@
                 <title>Run a Test</title>
 
                 <execute output="y">
-                    <exe-cmd>pgbackrest/test/test.pl {[dash]}-vm=u19 {[dash]}-dev {[dash]}-module=mock {[dash]}-test=archive {[dash]}-run=2</exe-cmd>
+                    <exe-cmd>pgbackrest/test/test.pl {[dash]}-vm=u18 {[dash]}-dev {[dash]}-module=mock {[dash]}-test=archive {[dash]}-run=2</exe-cmd>
                     <exe-cmd-extra>{[test-cmd-extra]}</exe-cmd-extra>
                 </execute>
             </execute-list>