[FM-6956] Removal of unsupported OS from apt

puppetlabs · May 29, 2018 · 610de21 · 610de21
1 parent 37159f2
commit 610de21
Show file tree

Hide file tree

Showing 12 changed files with 122 additions and 123 deletions.
diff --git a/metadata.json b/metadata.json
@@ -17,7 +17,6 @@
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [
-        "7",
         "8"
       ]
     },

diff --git a/spec/classes/apt_backports_spec.rb b/spec/classes/apt_backports_spec.rb
@@ -7,10 +7,10 @@
     context 'with defaults on deb' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
           lsbdistid: 'Debian',
           osfamily: 'Debian',
-          lsbdistcodename: 'wheezy',
+          lsbdistcodename: 'jessie',
           puppetversion: Puppet.version,
         }
       end
@@ -19,18 +19,18 @@
         is_expected.to contain_apt__source('backports').with(location: 'http://deb.debian.org/debian',
                                                              key: 'A1BD8E9D78F7FE5C3E65D8AF8B48AD6246925553',
                                                              repos: 'main contrib non-free',
-                                                             release: 'wheezy-backports',
-                                                             pin: { 'priority' => 200, 'release' => 'wheezy-backports' })
+                                                             release: 'jessie-backports',
+                                                             pin: { 'priority' => 200, 'release' => 'jessie-backports' })
       }
     end
     context 'with defaults on ubuntu' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
+          os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
           lsbdistid: 'Ubuntu',
           osfamily: 'Debian',
-          lsbdistcodename: 'trusty',
-          lsbdistrelease: '14.04',
+          lsbdistcodename: 'xenial',
+          lsbdistrelease: '16.04',
           puppetversion: Puppet.version,
         }
       end
@@ -39,18 +39,18 @@
         is_expected.to contain_apt__source('backports').with(location: 'http://archive.ubuntu.com/ubuntu',
                                                              key: '630239CC130E1A7FD81A27B140976EAF437D05B5',
                                                              repos: 'main universe multiverse restricted',
-                                                             release: 'trusty-backports',
-                                                             pin: { 'priority' => 200, 'release' => 'trusty-backports' })
+                                                             release: 'xenial-backports',
+                                                             pin: { 'priority' => 200, 'release' => 'xenial-backports' })
       }
     end
     context 'with everything set' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
+          os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
           lsbdistid: 'Ubuntu',
           osfamily: 'Debian',
-          lsbdistcodename: 'trusty',
-          lsbdistrelease: '14.04',
+          lsbdistcodename: 'xenial',
+          lsbdistrelease: '16.04',
           puppetversion: Puppet.version,
         }
       end
@@ -75,11 +75,11 @@
     context 'when set things with hashes' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
+          os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
           lsbdistid: 'Ubuntu',
           osfamily: 'Debian',
-          lsbdistcodename: 'trusty',
-          lsbdistrelease: '14.04',
+          lsbdistcodename: 'xenian',
+          lsbdistrelease: '16.04',
           puppetversion: Puppet.version,
         }
       end
@@ -185,11 +185,11 @@
   describe 'validation' do
     let(:facts) do
       {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '14', full: '14.04' } },
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
         lsbdistid: 'Ubuntu',
         osfamily: 'Debian',
-        lsbdistcodename: 'trusty',
-        lsbdistrelease: '14.04',
+        lsbdistcodename: 'xenian',
+        lsbdistrelease: '16.04',
         puppetversion: Puppet.version,
       }
     end

diff --git a/spec/classes/apt_spec.rb b/spec/classes/apt_spec.rb
@@ -188,11 +188,11 @@
 
   context 'with sources defined on valid osfamily' do
     let :facts do
-      { os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04' } },
+      { os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
         osfamily: 'Debian',
-        lsbdistcodename: 'precise',
+        lsbdistcodename: 'xenian',
         lsbdistid: 'Ubuntu',
-        lsbdistrelease: '12.04',
+        lsbdistrelease: '16.04',
         puppetversion: Puppet.version }
     end
     let(:params) do
@@ -224,15 +224,15 @@
       is_expected.to contain_apt__setting('list-puppetlabs').with(ensure: 'present')
     }
 
-    it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(%r{^deb http://apt.puppetlabs.com precise main$}) }
+    it { is_expected.to contain_file('/etc/apt/sources.list.d/puppetlabs.list').with_content(%r{^deb http://apt.puppetlabs.com xenian main$}) }
   end
 
   context 'with confs defined on valid osfamily' do
     let :facts do
       {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
         osfamily: 'Debian',
-        lsbdistcodename: 'precise',
+        lsbdistcodename: 'xenian',
         lsbdistid: 'Debian',
         puppetversion: Puppet.version,
       }
@@ -260,9 +260,9 @@
   context 'with keys defined on valid osfamily' do
     let :facts do
       {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
         osfamily: 'Debian',
-        lsbdistcodename: 'precise',
+        lsbdistcodename: 'xenian',
         lsbdistid: 'Debian',
         puppetversion: Puppet.version,
       }
@@ -290,11 +290,11 @@
   context 'with ppas defined on valid osfamily' do
     let :facts do
       {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
         osfamily: 'Debian',
-        lsbdistcodename: 'precise',
+        lsbdistcodename: 'xenian',
         lsbdistid: 'ubuntu',
-        lsbdistrelease: '12.04',
+        lsbdistrelease: '16.04',
         puppetversion: Puppet.version,
       }
     end
@@ -312,9 +312,9 @@
   context 'with settings defined on valid osfamily' do
     let :facts do
       {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
         osfamily: 'Debian',
-        lsbdistcodename: 'precise',
+        lsbdistcodename: 'xenian',
         lsbdistid: 'Debian',
         puppetversion: Puppet.version,
       }
@@ -333,9 +333,9 @@
   context 'with pins defined on valid osfamily' do
     let :facts do
       {
-        os: { family: 'Debian', name: 'Ubuntu', release: { major: '12', full: '12.04.5' } },
+        os: { family: 'Debian', name: 'Ubuntu', release: { major: '16', full: '16.04' } },
         osfamily: 'Debian',
-        lsbdistcodename: 'precise',
+        lsbdistcodename: 'xenian',
         lsbdistid: 'Debian',
         puppetversion: Puppet.version,
       }

diff --git a/spec/classes/apt_update_spec.rb b/spec/classes/apt_update_spec.rb
@@ -10,11 +10,11 @@
       context "when $::apt_update_last_success indicates #{desc}" do
         let(:facts) do
           {
-            os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
             lsbdistid: 'Debian',
             osfamily: 'Debian',
             apt_update_last_success: factval,
-            lsbdistcodename: 'wheezy',
+            lsbdistcodename: 'jessie',
             puppetversion: Puppet.version,
           }
         end
@@ -31,10 +31,10 @@
     context 'when $::apt_update_last_success is nil' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
           lsbdistid: 'Debian',
           osfamily: 'Debian',
-          lsbdistcodename: 'wheezy',
+          lsbdistcodename: 'jessie',
           puppetversion: Puppet.version,
         }
       end
@@ -55,11 +55,11 @@
       context "when $::apt_update_last_success indicates #{desc}" do
         let(:facts) do
           {
-            os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
             lsbdistid: 'Debian',
             osfamily: 'Debian',
             apt_update_last_success: factval,
-            lsbdistcodename: 'wheezy',
+            lsbdistcodename: 'jessie',
             puppetversion: Puppet.version,
           }
         end
@@ -74,10 +74,10 @@
     context 'when $::apt_update_last_success is nil' do
       let(:facts) do
         {
-          os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+          os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
           lsbdistid: 'Debian',
           osfamily: 'Debian',
-          lsbdistcodename: 'wheezy',
+          lsbdistcodename: 'jessie',
           puppetversion: Puppet.version,
         }
       end
@@ -95,11 +95,11 @@
         context "when $::apt_update_last_success indicates #{desc}" do
           let(:facts) do
             {
-              os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+              os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
               lsbdistid: 'Debian',
               osfamily: 'Debian',
               apt_update_last_success: factval,
-              lsbdistcodename: 'wheezy',
+              lsbdistcodename: 'jessie',
               puppetversion: Puppet.version,
             }
           end
@@ -114,10 +114,10 @@
       context 'when the $::apt_update_last_success fact has a recent value' do
         let(:facts) do
           {
-            os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
             lsbdistid: 'Debian',
             osfamily: 'Debian',
-            lsbdistcodename: 'wheezy',
+            lsbdistcodename: 'jessie',
             apt_update_last_success: Time.now.to_i,
             puppetversion: Puppet.version,
           }
@@ -132,10 +132,10 @@
       context 'when $::apt_update_last_success is nil' do
         let(:facts) do
           {
-            os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+            os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
             lsbdistid: 'Debian',
             osfamily: 'Debian',
-            lsbdistcodename: 'wheezy',
+            lsbdistcodename: 'jessie',
             apt_update_last_success: nil,
             puppetversion: Puppet.version,
           }

diff --git a/spec/defines/conf_spec.rb b/spec/defines/conf_spec.rb
@@ -5,10 +5,10 @@
   end
   let(:facts) do
     {
-      os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+      os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
       lsbdistid: 'Debian',
       osfamily: 'Debian',
-      lsbdistcodename: 'wheezy',
+      lsbdistcodename: 'jessie',
       puppetversion: Puppet.version,
     }
   end

diff --git a/spec/defines/key_compat_spec.rb b/spec/defines/key_compat_spec.rb
@@ -23,7 +23,7 @@ def apt_key_example(title)
 
   let(:facts) do
     {
-      os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+      os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
       lsbdistid: 'Debian',
       osfamily: 'Debian',
       puppetversion: Puppet.version,

diff --git a/spec/defines/key_spec.rb b/spec/defines/key_spec.rb
@@ -43,10 +43,10 @@ def absent_apt_key(title)
 
   let(:facts) do
     {
-      os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+      os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
       lsbdistid: 'Debian',
       osfamily: 'Debian',
-      lsbdistcodename: 'wheezy',
+      lsbdistcodename: 'jessie',
       puppetversion: Puppet.version,
     }
   end

diff --git a/spec/defines/pin_spec.rb b/spec/defines/pin_spec.rb
@@ -5,10 +5,10 @@
   end
   let(:facts) do
     {
-      os: { family: 'Debian', name: 'Debian', release: { major: '7', full: '7.0' } },
+      os: { family: 'Debian', name: 'Debian', release: { major: '8', full: '8.0' } },
       lsbdistid: 'Debian',
       osfamily: 'Debian',
-      lsbdistcodename: 'wheezy',
+      lsbdistcodename: 'jessie',
       puppetversion: Puppet.version,
     }
   end