[FM-6960] Removal of unsupported OS from postgresql

David Swan · David Swan · commit e61579ff4af3 · 2018-05-30T11:36:09.000+01:00
diff --git a/metadata.json b/metadata.json
@@ -49,15 +49,13 @@
     {
       "operatingsystem": "Scientific",
       "operatingsystemrelease": [
-        "5",
         "6",
         "7"
       ]
     },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "7",
         "8",
         "9"
       ]
diff --git a/spec/unit/classes/client_spec.rb b/spec/unit/classes/client_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
     }
   end
 
diff --git a/spec/unit/classes/globals_spec.rb b/spec/unit/classes/globals_spec.rb
@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe 'postgresql::globals', type: :class do
-  context 'on a debian 6' do
+  context 'on a debian 8' do
     let(:facts) do
       {
         os: {
           family: 'Debian',
           name: 'Debian',
           release: {
-            full: '6.0',
-            major: '6',
+            full: '8.0',
+            major: '8',
           },
         },
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        operatingsystemrelease: '6.0',
+        operatingsystemrelease: '8.0',
         lsbdistid: 'Debian',
-        lsbdistcodename: 'squeeze',
+        lsbdistcodename: 'jessie',
       }
     end
 
diff --git a/spec/unit/classes/lib/devel_spec.rb b/spec/unit/classes/lib/devel_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
     }
   end
 
diff --git a/spec/unit/classes/lib/java_spec.rb b/spec/unit/classes/lib/java_spec.rb
@@ -6,13 +6,13 @@
       {
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        operatingsystemrelease: '6.0',
+        operatingsystemrelease: '8.0',
       }
     end
 
     it {
       is_expected.to contain_package('postgresql-jdbc').with(
-        name: 'libpg-java',
+        name: 'libpostgresql-jdbc-java',
         ensure: 'present',
         tag: 'postgresql',
       )
diff --git a/spec/unit/classes/lib/perl_spec.rb b/spec/unit/classes/lib/perl_spec.rb
@@ -23,7 +23,7 @@
       {
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        operatingsystemrelease: '6.0',
+        operatingsystemrelease: '8.0',
       }
     end
 
diff --git a/spec/unit/classes/lib/python_spec.rb b/spec/unit/classes/lib/python_spec.rb
@@ -23,7 +23,7 @@
       {
         osfamily: 'Debian',
         operatingsystem: 'Debian',
-        operatingsystemrelease: '6.0',
+        operatingsystemrelease: '8.0',
       }
     end
 
diff --git a/spec/unit/classes/params_spec.rb b/spec/unit/classes/params_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
     }
   end
 
diff --git a/spec/unit/classes/repo_spec.rb b/spec/unit/classes/repo_spec.rb
@@ -7,15 +7,15 @@
         name: 'Debian',
         family: 'Debian',
         release: {
-          full: '6.0',
-          major: '6',
+          full: '8.0',
+          major: '8',
         },
       },
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       lsbdistid: 'Debian',
-      lsbdistcodename: 'squeeze',
+      lsbdistcodename: 'jessie',
     }
   end
 
diff --git a/spec/unit/classes/server/contrib_spec.rb b/spec/unit/classes/server/contrib_spec.rb
@@ -9,7 +9,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('contrib'),
       id: 'root',
diff --git a/spec/unit/classes/server/plperl_spec.rb b/spec/unit/classes/server/plperl_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('plperl'),
       id: 'root',
diff --git a/spec/unit/classes/server/postgis_spec.rb b/spec/unit/classes/server/postgis_spec.rb
@@ -9,7 +9,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('postgis'),
       id: 'root',
diff --git a/spec/unit/classes/server_spec.rb b/spec/unit/classes/server_spec.rb
@@ -7,8 +7,8 @@
         family: 'Debian',
         name: 'Debian',
         release: {
-          full: '6.0',
-          major: '6',
+          full: '8.0',
+          major: '8',
         },
       },
       osfamily: 'Debian',
diff --git a/spec/unit/defines/server/database_grant_spec.rb b/spec/unit/defines/server/database_grant_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('contrib'),
       id: 'root',
diff --git a/spec/unit/defines/server/database_spec.rb b/spec/unit/defines/server/database_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('contrib'),
       id: 'root',
diff --git a/spec/unit/defines/server/db_spec.rb b/spec/unit/defines/server/db_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('contrib'),
       id: 'root',
diff --git a/spec/unit/defines/server/extension_spec.rb b/spec/unit/defines/server/extension_spec.rb
@@ -12,7 +12,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('postgis'),
       id: 'root',
diff --git a/spec/unit/defines/server/grant_role_spec.rb b/spec/unit/defines/server/grant_role_spec.rb
@@ -8,7 +8,7 @@
   let(:facts) do
     { osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux', concat_basedir: tmpfilename('postgis'),
       id: 'root',
       path: '/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' }
diff --git a/spec/unit/defines/server/grant_spec.rb b/spec/unit/defines/server/grant_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('contrib'),
       id: 'root',
diff --git a/spec/unit/defines/server/pg_hba_rule_spec.rb b/spec/unit/defines/server/pg_hba_rule_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('pg_hba'),
       id: 'root',
diff --git a/spec/unit/defines/server/pg_ident_rule_spec.rb b/spec/unit/defines/server/pg_ident_rule_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('pg_ident'),
       id: 'root',
diff --git a/spec/unit/defines/server/reassign_owned_by_spec.rb b/spec/unit/defines/server/reassign_owned_by_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('reassign_owned_by'),
       id: 'root',
diff --git a/spec/unit/defines/server/recovery_spec.rb b/spec/unit/defines/server/recovery_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('recovery'),
       id: 'root',
diff --git a/spec/unit/defines/server/role_spec.rb b/spec/unit/defines/server/role_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('contrib'),
       id: 'root',
diff --git a/spec/unit/defines/server/schema_spec.rb b/spec/unit/defines/server/schema_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('schema'),
       id: 'root',
diff --git a/spec/unit/defines/server/table_grant_spec.rb b/spec/unit/defines/server/table_grant_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('table_grant'),
       id: 'root',
diff --git a/spec/unit/defines/server/tablespace_spec.rb b/spec/unit/defines/server/tablespace_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
       kernel: 'Linux',
       concat_basedir: tmpfilename('tablespace'),
       id: 'root',
diff --git a/spec/unit/defines/validate_db_connection_spec.rb b/spec/unit/defines/validate_db_connection_spec.rb
@@ -5,7 +5,7 @@
     {
       osfamily: 'Debian',
       operatingsystem: 'Debian',
-      operatingsystemrelease: '6.0',
+      operatingsystemrelease: '8.0',
     }
   end
 

Original file line number	Diff line number	Diff line change
`@@ -49,15 +49,13 @@`
`49`	`49`	`{`
`50`	`50`	`"operatingsystem": "Scientific",`
`51`	`51`	`"operatingsystemrelease": [`
`52`		`- "5",`
`53`	`52`	`"6",`
`54`	`53`	`"7"`
`55`	`54`	`]`
`56`	`55`	`},`
`57`	`56`	`{`
`58`	`57`	`"operatingsystem": "Debian",`
`59`	`58`	`"operatingsystemrelease": [`
`60`		`- "7",`
`61`	`59`	`"8",`
`62`	`60`	`"9"`
`63`	`61`	`]`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`{`
`6`	`6`	`osfamily: 'Debian',`
`7`	`7`	`operatingsystem: 'Debian',`
`8`		`- operatingsystemrelease: '6.0',`
	`8`	`+ operatingsystemrelease: '8.0',`
`9`	`9`	`}`
`10`	`10`	`end`
`11`	`11`
Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,13 @@`
`6`	`6`	`{`
`7`	`7`	`osfamily: 'Debian',`
`8`	`8`	`operatingsystem: 'Debian',`
`9`		`- operatingsystemrelease: '6.0',`
	`9`	`+ operatingsystemrelease: '8.0',`
`10`	`10`	`}`
`11`	`11`	`end`
`12`	`12`
`13`	`13`	`it {`
`14`	`14`	`is_expected.to contain_package('postgresql-jdbc').with(`
`15`		`- name: 'libpg-java',`
	`15`	`+ name: 'libpostgresql-jdbc-java',`
`16`	`16`	`ensure: 'present',`
`17`	`17`	`tag: 'postgresql',`
`18`	`18`	`)`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`{`
`24`	`24`	`osfamily: 'Debian',`
`25`	`25`	`operatingsystem: 'Debian',`
`26`		`- operatingsystemrelease: '6.0',`
	`26`	`+ operatingsystemrelease: '8.0',`
`27`	`27`	`}`
`28`	`28`	`end`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`{`
`10`	`10`	`osfamily: 'Debian',`
`11`	`11`	`operatingsystem: 'Debian',`
`12`		`- operatingsystemrelease: '6.0',`
	`12`	`+ operatingsystemrelease: '8.0',`
`13`	`13`	`kernel: 'Linux',`
`14`	`14`	`concat_basedir: tmpfilename('contrib'),`
`15`	`15`	`id: 'root',`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`{`
`13`	`13`	`osfamily: 'Debian',`
`14`	`14`	`operatingsystem: 'Debian',`
`15`		`- operatingsystemrelease: '6.0',`
	`15`	`+ operatingsystemrelease: '8.0',`
`16`	`16`	`kernel: 'Linux',`
`17`	`17`	`concat_basedir: tmpfilename('postgis'),`
`18`	`18`	`id: 'root',`