Drop EL7 support

theforeman · Jun 28, 2022 · f817b5b · f817b5b
1 parent ed4a366
commit f817b5b
Show file tree

Hide file tree

Showing 21 changed files with 23 additions and 221 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -7,5 +7,3 @@ Gemfile:
 spec/spec_helper.rb:
   requires:
     - webmock/rspec
-spec/spec_helper_acceptance.rb:
-  locale_workaround: true
diff --git a/manifests/cli/params.pp b/manifests/cli/params.pp
@@ -13,26 +13,11 @@
   # OS specific paths
   case $facts['os']['family'] {
     'RedHat': {
-      # We use system packages except on EL7
-      if versioncmp($facts['os']['release']['major'], '8') >= 0 {
-        $_hammer_plugin_prefix = 'rubygem-hammer_cli_'
-      } else {
-        $_hammer_plugin_prefix = 'tfm-rubygem-hammer_cli_'
-      }
+      $_hammer_plugin_prefix = 'rubygem-hammer_cli_'
     }
     'Debian': {
       $_hammer_plugin_prefix = 'ruby-hammer-cli-'
     }
-    'Linux': {
-      case $facts['os']['name'] {
-        'Amazon': {
-          $_hammer_plugin_prefix = 'tfm-rubygem-hammer_cli_'
-        }
-        default: {
-          fail("${facts['networking']['hostname']}: This module does not support operatingsystem ${facts['os']['name']}")
-        }
-      }
-    }
     /(ArchLinux|Suse)/: {
       $_hammer_plugin_prefix = undef
     }

diff --git a/manifests/install.pp b/manifests/install.pp
@@ -10,13 +10,6 @@
     }
   }
 
-  # Foreman 2.5 dropped support for Passenger. On EL7 there was a native package built for SCL that should be absent.
-  if $foreman::passenger_ruby_package {
-    package { $foreman::passenger_ruby_package:
-      ensure => absent,
-    }
-  }
-
   package { 'foreman-service':
     ensure => $foreman::version,
   }

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -85,38 +85,13 @@
   # OS specific paths
   case $facts['os']['family'] {
     'RedHat': {
-      # We use system packages except on EL7
-      if versioncmp($facts['os']['release']['major'], '8') >= 0 {
-        $passenger_ruby_package = undef
-        $_plugin_prefix = 'rubygem-foreman_'
-        $configure_scl_repo = false
-      } else {
-        $passenger_ruby_package = 'tfm-rubygem-passenger-native'
-        $_plugin_prefix = 'tfm-rubygem-foreman_'
-        $configure_scl_repo = true
-      }
-
+      $_plugin_prefix = 'rubygem-foreman_'
       $user_shell = '/sbin/nologin'
     }
     'Debian': {
-      $passenger_ruby_package = undef
       $_plugin_prefix = 'ruby-foreman-'
-      $configure_scl_repo = false
       $user_shell = '/usr/sbin/nologin'
     }
-    'Linux': {
-      case $facts['os']['name'] {
-        'Amazon': {
-          $passenger_ruby_package = 'tfm-rubygem-passenger-native'
-          $_plugin_prefix = 'tfm-rubygem-foreman_'
-          $configure_scl_repo = true
-          $user_shell = '/sbin/nologin'
-        }
-        default: {
-          fail("${facts['networking']['hostname']}: This module does not support operatingsystem ${facts['os']['name']}")
-        }
-      }
-    }
     default: {
       fail("${facts['networking']['hostname']}: This module does not support osfamily ${facts['os']['family']}")
     }

diff --git a/manifests/providers/params.pp b/manifests/providers/params.pp
@@ -27,20 +27,6 @@
     'Archlinux': {
       $oauth_package = 'ruby-oauth'
     }
-    'Linux': {
-      case $facts['os']['name'] {
-        'Amazon': {
-          if $is_aio {
-            $oauth_package = 'puppet-agent-oauth'
-          } else {
-            $oauth_package = 'rubygem-oauth'
-          }
-        }
-        default: {
-          fail("${facts['networking']['hostname']}: This class does not support operatingsystem ${facts['os']['name']}")
-        }
-      }
-    }
     default: {
       fail("${facts['networking']['hostname']}: This class does not support osfamily ${facts['os']['family']}")
     }

diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -3,23 +3,14 @@
 # @param repo
 #   The repository version to manage. This can be a specific version or nightly
 #
-# @param configure_scl_repo
-#   If disabled the SCL repo will not be configured on Red Hat clone systems.
-#   (Currently only installs repos for CentOS and Scientific)
-#
 # @param gpgcheck
 #   Turn on/off gpg check in repo files (effective only on RedHat family systems)
 #
-# @param scl_repo_ensure
-#   The ensure to set on the SCL repo package
-#
 # @param yum_repo_baseurl
 #   The base URL for Yum repositories
 class foreman::repo (
   Optional[Variant[Enum['nightly'], Pattern['^\d+\.\d+$']]] $repo = undef,
   Boolean $gpgcheck = true,
-  Boolean $configure_scl_repo = $facts['os']['name'] == 'CentOS' and $facts['os']['release']['major'] == '7',
-  String $scl_repo_ensure = 'installed',
   Stdlib::HTTPUrl $yum_repo_baseurl = 'https://yum.theforeman.org',
 ) {
   if $repo {
@@ -30,30 +21,13 @@
       before           => Anchor['foreman::repo'],
     }
 
-    if $configure_scl_repo {
-      Foreman::Repos['foreman'] -> Package['centos-release-scl-rh']
-    }
-
-    if $facts['os']['release']['major'] == '8' and ($repo == 'nightly' or versioncmp($repo, '3.2') >= 0) {
+    if $facts['os']['family'] == 'RedHat' {
       package { 'foreman':
         ensure      => "el${facts['os']['release']['major']}",
         enable_only => true,
         provider    => 'dnfmodule',
         require     => Foreman::Repos['foreman'],
       }
-    } elsif $facts['os']['release']['major'] == '8' and versioncmp($repo, '2.5') >= 0 {
-      package { 'ruby':
-        ensure      => '2.7',
-        enable_only => true,
-        provider    => 'dnfmodule',
-      }
-    }
-  }
-
-  if $configure_scl_repo {
-    package { 'centos-release-scl-rh':
-      ensure => $scl_repo_ensure,
-      before => Anchor['foreman::repo'],
     }
   }
 

diff --git a/manifests/repos.pp b/manifests/repos.pp
@@ -6,16 +6,10 @@
   Boolean $gpgcheck = true,
 ) {
   case $facts['os']['family'] {
-    'RedHat', 'Linux': {
-      $yumcode = $facts['os']['name'] ? {
-        'Amazon' => 'el7',
-        'Fedora' => "f${facts['os']['release']['major']}",
-        default  => "el${facts['os']['release']['major']}",
-      }
-
+    'RedHat': {
       foreman::repos::yum { $name:
         repo     => $repo,
-        yumcode  => $yumcode,
+        yumcode  => "el${facts['os']['release']['major']}",
         gpgcheck => $gpgcheck,
         baseurl  => $yum_repo_baseurl,
       }

diff --git a/metadata.json b/metadata.json
@@ -55,23 +55,15 @@
     {
       "operatingsystem": "RedHat",
       "operatingsystemrelease": [
-        "7",
         "8"
       ]
     },
     {
       "operatingsystem": "CentOS",
       "operatingsystemrelease": [
-        "7",
         "8"
       ]
     },
-    {
-      "operatingsystem": "Scientific",
-      "operatingsystemrelease": [
-        "7"
-      ]
-    },
     {
       "operatingsystem": "Debian",
       "operatingsystemrelease": [

diff --git a/spec/acceptance/foreman_cli_plugins_spec.rb b/spec/acceptance/foreman_cli_plugins_spec.rb
@@ -3,8 +3,6 @@
 describe 'Scenario: install foreman-cli + plugins without foreman' do
   before(:context) { purge_foreman }
 
-  package_prefix = fact('os.release.major') == '7' ? "tfm-" : ""
-
   context 'for standard plugins' do
 
     it_behaves_like 'an idempotent resource' do
@@ -36,7 +34,7 @@ class { 'foreman::cli':
     ['discovery', 'host_reports', 'remote_execution', 'tasks', 'templates', 'webhooks', 'puppet'].each do |plugin|
       package_name = case fact('os.family')
                      when 'RedHat'
-                       "#{package_prefix}rubygem-hammer_cli_foreman_#{plugin}"
+                       "rubygem-hammer_cli_foreman_#{plugin}"
                      when 'Debian'
                        "ruby-hammer-cli-foreman-#{plugin.tr('_', '-')}"
                      else
@@ -59,15 +57,13 @@ class { 'foreman::cli':
             gpgcheck => 0,
           }
 
-          if $facts['os']['release']['major'] == '8' {
-            package { 'katello':
-              ensure      => "el${facts['os']['release']['major']}",
-              enable_only => true,
-              provider    => 'dnfmodule',
-              require     => Yumrepo['katello'],
-            }
-            Package['katello'] -> Class['foreman::cli::katello']
+          package { 'katello':
+            ensure      => "el${facts['os']['release']['major']}",
+            enable_only => true,
+            provider    => 'dnfmodule',
+            require     => Yumrepo['katello'],
           }
+          Package['katello'] -> Class['foreman::cli::katello']
 
           class { 'foreman::cli':
             foreman_url => 'https://foreman.example.com',
@@ -84,7 +80,7 @@ class { 'foreman::cli':
 
       it_behaves_like 'hammer'
 
-      package_name = "#{package_prefix}rubygem-hammer_cli_katello"
+      package_name = "rubygem-hammer_cli_katello"
       describe package(package_name) do
         it { is_expected.to be_installed }
       end

diff --git a/spec/acceptance/foreman_journald_spec.rb b/spec/acceptance/foreman_journald_spec.rb
@@ -19,15 +19,11 @@ class { 'foreman':
     it { is_expected.to be_installed }
   end
 
-  # Logging to the journal is broken on Docker 18+ and EL7 but works in Vagrant
-  # VMs (and EL7's Docker version)
-  broken_journald_logging = ENV['BEAKER_HYPERVISOR'] == 'docker' && os[:family] == 'redhat' && os[:release] =~ /^7\./
-
-  describe command('journalctl -u foreman'), unless: broken_journald_logging do
+  describe command('journalctl -u foreman') do
     its(:stdout) { is_expected.to match(%r{Redirected to https://#{host_inventory['fqdn']}/users/login}) }
   end
 
-  describe command('journalctl -u dynflow-sidekiq@orchestrator'), unless: broken_journald_logging do
+  describe command('journalctl -u dynflow-sidekiq@orchestrator') do
     its(:stdout) { is_expected.to match(%r{Everything ready for world: }) }
   end
 end
diff --git a/spec/acceptance/hieradata/os/RedHat/7.yaml b/spec/acceptance/hieradata/os/RedHat/7.yaml
diff --git a/spec/classes/foreman_repo_spec.rb b/spec/classes/foreman_repo_spec.rb
@@ -9,14 +9,6 @@
         it { is_expected.to compile.with_all_deps }
         it { is_expected.to contain_anchor('foreman::repo') }
         it { is_expected.not_to contain_foreman__repos('foreman') }
-
-        it do
-          if facts[:operatingsystem] == 'CentOS' && facts[:operatingsystemmajrelease] == '7'
-            is_expected.to contain_package('centos-release-scl-rh')
-          else
-            is_expected.not_to contain_package('centos-release-scl-rh')
-          end
-        end
       end
 
       describe 'with minimal parameters' do
@@ -30,15 +22,7 @@
         }
 
         it do
-          if facts[:operatingsystem] == 'CentOS' && facts[:operatingsystemmajrelease] == '7'
-            is_expected.to contain_package('centos-release-scl-rh')
-          else
-            is_expected.not_to contain_package('centos-release-scl-rh')
-          end
-        end
-
-        it do
-          if facts[:operatingsystemmajrelease] == '8'
+          if facts[:osfamily] == 'RedHat'
             is_expected.to contain_package('foreman').with_ensure('el8').with_provider('dnfmodule')
           else
             is_expected.not_to contain_package('ruby')
@@ -50,7 +34,6 @@
         let :params do
           {
             repo: '1.19',
-            configure_scl_repo: false,
             yum_repo_baseurl: 'https://example.org'
           }
         end
@@ -63,31 +46,6 @@
             .with_gpgcheck(true)
             .with_yum_repo_baseurl('https://example.org')
         end
-
-        it { is_expected.not_to contain_package('centos-release-scl-rh') }
-
-        it do
-          is_expected.not_to contain_package('ruby')
-        end
-      end
-
-      describe 'with repo set to 2.5' do
-        let :params do
-          {
-            repo: '2.5',
-            configure_scl_repo: false
-          }
-        end
-
-        it { is_expected.to compile.with_all_deps }
-
-        it do
-          if facts[:operatingsystemmajrelease] == '8'
-            is_expected.to contain_package('ruby').with_ensure('2.7').with_provider('dnfmodule')
-          else
-            is_expected.not_to contain_package('ruby')
-          end
-        end
       end
     end
   end

diff --git a/spec/classes/foreman_service_spec.rb b/spec/classes/foreman_service_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'foreman::service' do
   let :facts do
-    on_supported_os['redhat-7-x86_64']
+    on_supported_os['redhat-8-x86_64']
   end
 
   let :params do

diff --git a/spec/classes/plugin/ovirt_provision_spec.rb b/spec/classes/plugin/ovirt_provision_spec.rb
@@ -11,7 +11,7 @@
       let(:package_name) do
         case facts[:osfamily]
         when 'RedHat'
-          facts[:os]['release']['major'] == '7' ? 'tfm-rubygem-ovirt_provision_plugin' : 'rubygem-ovirt_provision_plugin'
+          'rubygem-ovirt_provision_plugin'
         when 'Debian'
           'ruby-ovirt_provision_plugin'
         end

diff --git a/spec/classes/plugin/puppetdb_spec.rb b/spec/classes/plugin/puppetdb_spec.rb
@@ -11,7 +11,7 @@
       let(:package_name) do
         case facts[:osfamily]
         when 'RedHat'
-          facts[:os]['release']['major'] == '7' ? 'tfm-rubygem-puppetdb_foreman' : 'rubygem-puppetdb_foreman'
+          'rubygem-puppetdb_foreman'
         when 'Debian'
           'ruby-puppetdb_foreman'
         end

diff --git a/spec/classes/plugin/tasks_spec.rb b/spec/classes/plugin/tasks_spec.rb
@@ -12,7 +12,7 @@
       let(:package_name) do
         case facts[:osfamily]
         when 'RedHat'
-          facts[:os]['release']['major'] == '7' ? 'tfm-rubygem-foreman-tasks' : 'rubygem-foreman-tasks'
+          'rubygem-foreman-tasks'
         when 'Debian'
           'ruby-foreman-tasks'
         end