Drop support for EoL distros and Puppet 7

Puppet 7 is soon EoL and OpenVox doesn't provide packages for version 7, only 8.
voxpupuli · Jan 24, 2025 · 4cf9d34 · 4cf9d34
1 parent c2d5696
commit 4cf9d34
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 33 deletions.
diff --git a/lib/puppet_metadata/aio.rb b/lib/puppet_metadata/aio.rb
@@ -12,33 +12,29 @@ class AIO
     BUILDS = {
       # RPM-based
       'RedHat' => {
-        '7' => 7..8,
-        '8' => 7..8,
-        '9' => 7..8,
+        '8' => [8],
+        '9' => [8],
       },
       'Fedora' => {
-        '36' => 7..8,
-        '40' => 7..8,
+        '36' => [8],
+        '40' => [8],
       },
       'SLES' => {
-        '11' => [7],
-        '12' => 7..8,
-        '15' => 7..8,
+        '15' => [8],
       },
       # deb-based
       'Debian' => {
-        '11' => 7..8,
-        '12' => 7..8,
+        '11' => [8],
+        '12' => [8],
       },
       'Ubuntu' => {
-        '20.04' => 7..8,
-        '22.04' => 7..8,
-        '24.04' => 7..8,
+        '20.04' => [8],
+        '22.04' => [8],
+        '24.04' => [8],
       },
     }.freeze
 
     PUPPET_RUBY_VERSIONS = {
-      7 => '2.7',
       8 => '3.2',
     }.freeze
 

diff --git a/spec/github_actions_spec.rb b/spec/github_actions_spec.rb
@@ -90,22 +90,24 @@
 
       it { is_expected.to be_an_instance_of(Array) }
 
-      it 'is expected to contain major versions 4, 5, 6 and 7' do
+      it 'is expected to contain major version 8' do
         expect(subject).to contain_exactly(
           { puppet: 8, ruby: '3.2' },
-          { puppet: 7, ruby: '2.7' },
         )
       end
 
-      context 'when minimum_major_puppet_version is set to 8' do
-        let(:minimum_major_puppet_version) { '8' }
-
-        it 'is expected to contain major versions 8' do
-          expect(subject).to contain_exactly(
-            { puppet: 8, ruby: '3.2' },
-          )
-        end
-      end
+      # Test only makes sense when we've multiple supported versions
+      # context 'when minimum_major_puppet_version is set to 6' do
+      #  let(:minimum_major_puppet_version) { '6' }
+
+      #  it 'is expected to contain major versions 6,7 and 8' do
+      #    expect(subject).to contain_exactly(
+      #      { puppet: 8, ruby: '3.2' },
+      #      { puppet: 7, ruby: '2.7' },
+      #      { puppet: 6, ruby: '2.5' },
+      #    )
+      #  end
+      # end
     end
 
     describe 'puppet_beaker_test_matrix' do
@@ -116,20 +118,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 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 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 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 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}' } },
           { name: 'Puppet 8 - Debian 12', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet8', 'BEAKER_SETFILE' => 'debian12-64{hostname=debian12-64-puppet8}' } },
-          { name: 'Puppet 7 - Fedora 36', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet7', 'BEAKER_SETFILE' => 'fedora36-64{hostname=fedora36-64-puppet7}' } },
           { name: 'Puppet 8 - Fedora 36', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet8', 'BEAKER_SETFILE' => 'fedora36-64{hostname=fedora36-64-puppet8}' } },
           { name: 'Distro Puppet - Fedora 38', env: { 'BEAKER_PUPPET_COLLECTION' => 'none', 'BEAKER_SETFILE' => 'fedora38-64' } },
-          { name: 'Puppet 7 - Fedora 40', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet7', 'BEAKER_SETFILE' => 'fedora40-64{hostname=fedora40-64-puppet7}' } },
           { name: 'Puppet 8 - Fedora 40', env: { 'BEAKER_PUPPET_COLLECTION' => 'puppet8', 'BEAKER_SETFILE' => 'fedora40-64{hostname=fedora40-64-puppet8}' } },
         )
       end