Merge pull request puppetlabs#1005 from david22swan/MODULES-7479

(MODULES-7479) Update postgresql to support Ubuntu 18.04

Author: pmcmaw

metadata.json

@@ -71,7 +71,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
-        "16.04"
+        "16.04",
+        "18.04"
       ]
     }
   ],

spec/acceptance/server/config_entry_spec.rb

@@ -21,7 +21,7 @@ class { 'postgresql::server':
     # get postgresql version
     apply_manifest("class { 'postgresql::server': }")
     result = shell('psql --version')
-    version = result.stdout.match(%r{\s(\d\.\d)})[1]
+    version = result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]
 
     if version >= '9.3'
       it 'is expected to run idempotently' do

spec/acceptance/server/grant_spec.rb

@@ -94,7 +94,7 @@ class { 'postgresql::server': }
 
         # postgres version
         result = shell('psql --version')
-        version = result.stdout.match(%r{\s(\d\.\d)})[1]
+        version = result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]
 
         if version >= '8.4.0'
           apply_manifest(pp_lang, catch_failures: true)
@@ -104,7 +104,7 @@ class { 'postgresql::server': }
 
       it 'is expected to GRANT USAGE ON LANGUAGE plpgsql to ROLE' do
         result = shell('psql --version')
-        version = result.stdout.match(%r{\s(\d\.\d)})[1]
+        version = result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]
 
         if version >= '8.4.0'
           ## Check that the privilege was granted to the user
@@ -121,7 +121,7 @@ class { 'postgresql::server': }
 
         # postgres version
         result = shell('psql --version')
-        version = result.stdout.match(%r{\s(\d\.\d)})[1]
+        version = result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]
 
         if version >= '8.4.0'
           apply_manifest(pp_onlyif, catch_failures: true)
@@ -179,7 +179,7 @@ class { 'postgresql::server': }
       shell('psql --version')
     end
     let(:version) do
-      result.stdout.match(%r{\s(\d\.\d)})[1]
+      result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]
     end
 
     before(:each) do
@@ -266,7 +266,7 @@ class { 'postgresql::server': }
       shell('psql --version')
     end
     let(:version) do
-      result.stdout.match(%r{\s(\d\.\d)})[1]
+      result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]
     end
 
     before(:each) do
@@ -351,7 +351,7 @@ class { 'postgresql::server': }
 
           # postgres version
           result = shell('psql --version')
-          version = result.stdout.match(%r{\s(\d\.\d)})[1]
+          version = result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]
 
           if version >= '9.0'
             apply_manifest(pp, catch_failures: true)
@@ -408,7 +408,7 @@ class { 'postgresql::server': }
 
           # postgres version
           result = shell('psql --version')
-          version = result.stdout.match(%r{\s(\d\.\d)})[1]
+          version = result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]
 
           if version >= '9.0'
             apply_manifest(pp, catch_failures: true)
@@ -438,7 +438,7 @@ class { 'postgresql::server': }
         begin
           # postgres version
           result = shell('psql --version')
-          version = result.stdout.match(%r{\s(\d\.\d)})[1]
+          version = result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]
 
           if version >= '9.0'
             pp = pp_create_table + <<-EOS.unindent
@@ -493,7 +493,7 @@ class { 'postgresql::server': }
 
           # postgres version
           result = shell('psql --version')
-          version = result.stdout.match(%r{\s(\d\.\d)})[1]
+          version = result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]
 
           if version >= '9.0'
             apply_manifest(pp, catch_failures: true)
@@ -529,7 +529,7 @@ class { 'postgresql::server': }
           # Test fail's on postgresql versions earlier than 9.1.24
           # postgres version
           result = shell('psql --version')
-          version = result.stdout.match(%r{\s(\d\.\d)})[1]
+          version = result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]
 
           if version >= '9.1.24'
             apply_manifest(pp_setup, catch_failures: true)

spec/acceptance/server/reassign_owned_by_spec.rb

@@ -106,7 +106,7 @@ class { 'postgresql::server': }
         begin
           # postgres version
           result = shell('psql --version')
-          version = result.stdout.match(%r{\s(\d\.\d)})[1]
+          version = result.stdout.match(%r{\s(\d{1,2}\.\d)})[1]
           if version >= '9.0'
 
             apply_manifest(pp_setup + pp_db_old_owner + pp_setup_objects, catch_failures: true)