Merge pull request #903 from kenyon/debian10

update to Debian 10 and remove Debian 8
puppetlabs · Aug 3, 2020 · c315ff0 · c315ff0
2 parents 99c8507 + 266480a
commit c315ff0
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 23 deletions.
diff --git a/docs/pdk_install.md b/docs/pdk_install.md
@@ -27,14 +27,14 @@ compatibility, see the table below.
 |Operating system|Versions|Arch|Package type|
 |----------------|--------|----|------------|
 |CentOS|6, 7, 8|x86_64|RPM|
-|Debian|8, 9, 10|x86_64|DEB|
+|Debian|9, 10|x86_64|DEB|
 |Fedora|28, 29, 30|x86_64|RPM|
 |macOS|10.11, 10.12, 10.13, 10.14|x86_64|DPKG|
 |Oracle Linux|6, 7, 8|x86_64|RPM|
-|Red Hat Enterprise Linux (RHEL)|6, 7,8|x86_64|RPM| 
+|Red Hat Enterprise Linux (RHEL)|6, 7,8|x86_64|RPM|
 |Scientific Linux|6, 7|x86_64|RPM|
 |SUSE Linux Enterprise Server|11, 12|x86_64|N/A|
-|Ubuntu|16.04, 18.04, 20.04|x86_64|DEB| 
+|Ubuntu|16.04, 18.04, 20.04|x86_64|DEB|
 |Windows (Consumer OS)|7, 8.1, 10|x86_64|MSI|
 |Windows (Server OS)|2008r2, 2012, 2012r2, 2012r2Core, and 2016|x86_64|MSI|
 
@@ -59,7 +59,7 @@ Install PDK with the YUM package manager.
 
         ```
         sudo rpm -Uvh https://yum.puppet.com/puppet-tools-release-el-6.noarch.rpm
-        sudo yum install pdk            
+        sudo yum install pdk
         ```
 
     -   RHEL 7
@@ -123,21 +123,21 @@ Install PDK with the Apt package manager.
 1.  Download and install the software and its dependencies. Use the commands
     appropriate to your system.
 
-    -   Debian 8
+    -   Debian 9
 
         ```
-        wget https://apt.puppet.com/puppet-tools-release-jessie.deb
-        sudo dpkg -i puppet-tools-release-jessie.deb
-        sudo apt-get update 
+        wget https://apt.puppet.com/puppet-tools-release-stretch.deb
+        sudo dpkg -i puppet-tools-release-stretch.deb
+        sudo apt-get update
         sudo apt-get install pdk
         ```
 
-    -   Debian 9
+    -   Debian 10
 
         ```
-        wget https://apt.puppet.com/puppet-tools-release-stretch.deb
-        sudo dpkg -i puppet-tools-release-stretch.deb
-        sudo apt-get update 
+        wget https://apt.puppet.com/puppet-tools-release-buster.deb
+        sudo dpkg -i puppet-tools-release-buster.deb
+        sudo apt-get update
         sudo apt-get install pdk
         ```
 
@@ -146,7 +146,7 @@ Install PDK with the Apt package manager.
         ```
         wget https://apt.puppet.com/puppet-tools-release-trusty.deb
         sudo dpkg -i puppet-tools-release-trusty.deb
-        sudo apt-get update 
+        sudo apt-get update
         sudo apt-get install pdk
         ```
 
@@ -155,7 +155,7 @@ Install PDK with the Apt package manager.
         ```
         wget https://apt.puppet.com/puppet-tools-release-xenial.deb
         sudo dpkg -i puppet-tools-release-xenial.deb
-        sudo apt-get update 
+        sudo apt-get update
         sudo apt-get install pdk
         ```
 
@@ -164,7 +164,7 @@ Install PDK with the Apt package manager.
         ```
         wget https://apt.puppet.com/puppet-tools-release-bionic.deb
         sudo dpkg -i puppet-tools-release-bionic.deb
-        sudo apt-get update 
+        sudo apt-get update
         sudo apt-get install pdk
         ```
 
@@ -211,7 +211,7 @@ migrating your PDK installation to the Puppet Homebrew cask.
 1.  Install PDK by running `brew cask install puppetlabs/puppet/pdk`
 
 2.  Open a terminal to re-source your shell profile and make PDK available to
-    your PATH. 
+    your PATH.
 
 
 #### What to do next:
@@ -415,4 +415,3 @@ configuration:
 You can also opt out of analytics by setting the environment variable
 `PDK_DISABLE_ANALYTICS=true`. This is useful if you are using PDK in your CI
 system.
-
diff --git a/lib/pdk/module/metadata.rb b/lib/pdk/module/metadata.rb
@@ -27,7 +27,7 @@ class Metadata
         'Debian based Linux' => [
           {
             'operatingsystem'        => 'Debian',
-            'operatingsystemrelease' => ['9'],
+            'operatingsystemrelease' => ['10'],
           },
           {
             'operatingsystem'        => 'Ubuntu',

diff --git a/spec/acceptance/new_module_spec.rb b/spec/acceptance/new_module_spec.rb
@@ -25,7 +25,7 @@
             'template-ref' => match(%r{(master-)|(^(tags/)?(\d+)\.(\d+)\.(\d+))}),
             'operatingsystem_support' => include(
               'operatingsystem' => 'Debian',
-              'operatingsystemrelease' => ['9'],
+              'operatingsystemrelease' => ['10'],
             ),
           )
         end

diff --git a/spec/unit/pdk/generate/module_spec.rb b/spec/unit/pdk/generate/module_spec.rb
@@ -412,7 +412,7 @@
               },
               {
                 'operatingsystem'        => 'Debian',
-                'operatingsystemrelease' => ['9'],
+                'operatingsystemrelease' => ['10'],
               },
               {
                 'operatingsystem'        => 'Ubuntu',
@@ -653,7 +653,7 @@
         expect(interview_metadata['operatingsystem_support']).not_to be_nil
 
         [
-          { 'operatingsystem' => 'Debian', 'operatingsystemrelease' => ['9'] },
+          { 'operatingsystem' => 'Debian', 'operatingsystemrelease' => ['10'] },
           { 'operatingsystem' => 'Ubuntu', 'operatingsystemrelease' => ['18.04'] },
           { 'operatingsystem' => 'windows', 'operatingsystemrelease' => %w[2019 10] },
           { 'operatingsystem' => 'Solaris', 'operatingsystemrelease' => ['11'] },

diff --git a/spec/unit/pdk/module/metadata_spec.rb b/spec/unit/pdk/module/metadata_spec.rb
@@ -105,7 +105,7 @@
           'operatingsystem_support' => [
             {
               'operatingsystem'        => 'Debian',
-              'operatingsystemrelease' => ['8'],
+              'operatingsystemrelease' => ['10'],
             },
           ],
           'requirements' => [
@@ -153,7 +153,7 @@
           'operatingsystem_support' => [
             {
               'operatingsystem'        => 'Debian',
-              'operatingsystemrelease' => ['8'],
+              'operatingsystemrelease' => ['10'],
             },
           ],
           'requirements' => [