Merge pull request #163 from bastelfreak/eolpuppet

Drop support for EoL Puppet 4/5/6
voxpupuli · Jan 24, 2025 · c2d5696 · c2d5696
2 parents f44e4f1 + 6b475dd
commit c2d5696
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 23 deletions.
diff --git a/lib/puppet_metadata/aio.rb b/lib/puppet_metadata/aio.rb
@@ -12,9 +12,9 @@ class AIO
     BUILDS = {
       # RPM-based
       'RedHat' => {
-        '7' => 5..8,
-        '8' => 5..8,
-        '9' => 6..8,
+        '7' => 7..8,
+        '8' => 7..8,
+        '9' => 7..8,
       },
       'Fedora' => {
         '36' => 7..8,
@@ -27,20 +27,17 @@ class AIO
       },
       # deb-based
       'Debian' => {
-        '11' => 6..8,
+        '11' => 7..8,
         '12' => 7..8,
       },
       'Ubuntu' => {
-        '20.04' => 6..8,
-        '22.04' => 6..8,
+        '20.04' => 7..8,
+        '22.04' => 7..8,
         '24.04' => 7..8,
       },
     }.freeze
 
     PUPPET_RUBY_VERSIONS = {
-      4 => '2.1',
-      5 => '2.4',
-      6 => '2.5',
       7 => '2.7',
       8 => '3.2',
     }.freeze

diff --git a/spec/github_actions_spec.rb b/spec/github_actions_spec.rb
@@ -94,20 +94,15 @@
         expect(subject).to contain_exactly(
           { puppet: 8, ruby: '3.2' },
           { puppet: 7, ruby: '2.7' },
-          { puppet: 6, ruby: '2.5' },
-          { puppet: 5, ruby: '2.4' },
-          { puppet: 4, ruby: '2.1' },
         )
       end
 
-      context 'when minimum_major_puppet_version is set to 6' do
-        let(:minimum_major_puppet_version) { '6' }
+      context 'when minimum_major_puppet_version is set to 8' do
+        let(:minimum_major_puppet_version) { '8' }
 
-        it 'is expected to contain major versions 6,7 and 8' do
+        it 'is expected to contain major versions 8' do
           expect(subject).to contain_exactly(
             { puppet: 8, ruby: '3.2' },
-            { puppet: 7, ruby: '2.7' },
-            { puppet: 6, ruby: '2.5' },
           )
         end
       end
@@ -121,18 +116,12 @@
       it 'is expected to contain supported os / puppet version combinations' do
         expect(subject).to contain_exactly(
           { name: 'Distro Puppet - Archlinux rolling', env: { 'BEAKER_PUPPET_COLLECTION' => 'none', 'BEAKER_SETFILE' => 'archlinuxrolling-64' } },
-          { name: 'Puppet 5 - CentOS 7', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet5', 'BEAKER_SETFILE' => 'centos7-64{hostname=centos7-64-puppet5}' } },
-          { name: 'Puppet 6 - CentOS 7', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet6', 'BEAKER_SETFILE' => 'centos7-64{hostname=centos7-64-puppet6}' } },
           { name: 'Puppet 7 - CentOS 7', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet7', 'BEAKER_SETFILE' => 'centos7-64{hostname=centos7-64-puppet7}' } },
           { name: 'Puppet 8 - CentOS 7', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet8', 'BEAKER_SETFILE' => 'centos7-64{hostname=centos7-64-puppet8}' } },
-          { name: 'Puppet 5 - CentOS 8', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet5', 'BEAKER_SETFILE' => 'centos8-64{hostname=centos8-64-puppet5}' } },
-          { name: 'Puppet 6 - CentOS 8', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet6', 'BEAKER_SETFILE' => 'centos8-64{hostname=centos8-64-puppet6}' } },
           { name: 'Puppet 7 - CentOS 8', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet7', 'BEAKER_SETFILE' => 'centos8-64{hostname=centos8-64-puppet7}' } },
           { name: 'Puppet 8 - CentOS 8', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet8', 'BEAKER_SETFILE' => 'centos8-64{hostname=centos8-64-puppet8}' } },
-          { name: 'Puppet 6 - CentOS 9', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet6', 'BEAKER_SETFILE' => 'centos9-64{hostname=centos9-64-puppet6}' } },
           { name: 'Puppet 7 - CentOS 9', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet7', 'BEAKER_SETFILE' => 'centos9-64{hostname=centos9-64-puppet7}' } },
           { name: 'Puppet 8 - CentOS 9', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet8', 'BEAKER_SETFILE' => 'centos9-64{hostname=centos9-64-puppet8}' } },
-          { name: 'Puppet 6 - Debian 11', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet6', 'BEAKER_SETFILE' => 'debian11-64{hostname=debian11-64-puppet6}' } },
           { name: 'Puppet 7 - Debian 11', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet7', 'BEAKER_SETFILE' => 'debian11-64{hostname=debian11-64-puppet7}' } },
           { name: 'Puppet 8 - Debian 11', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet8', 'BEAKER_SETFILE' => 'debian11-64{hostname=debian11-64-puppet8}' } },
           { name: 'Puppet 7 - Debian 12', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet7', 'BEAKER_SETFILE' => 'debian12-64{hostname=debian12-64-puppet7}' } },