Skip to content

Commit

Permalink
Merge pull request #500 from sloanebernstein/RE-247
Browse files Browse the repository at this point in the history
Remove our handling of EPEL in favor of leapp's
  • Loading branch information
toddr authored Aug 20, 2024
2 parents d1673d1 + 99e18c0 commit eb218fe
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 26 deletions.
13 changes: 0 additions & 13 deletions elevate-cpanel
Original file line number Diff line number Diff line change
Expand Up @@ -5204,7 +5204,6 @@ EOS

sub pre_leapp ($self) {

$self->run_once("_disable_epel");
$self->run_once("_disable_yum_plugin_fastestmirror");
$self->run_once("_disable_known_yum_repositories");

Expand Down Expand Up @@ -5236,15 +5235,6 @@ EOS
return;
}

sub _disable_epel ($self) {

return if Elevate::OS::leapp_can_handle_epel();

my $pkg = 'epel-release';
$self->_erase_package($pkg);
return;
}

sub _erase_package ( $self, $pkg ) {
return unless Cpanel::Pkgr::is_installed($pkg);
$self->rpm->remove_no_dependencies($pkg);
Expand Down Expand Up @@ -6019,7 +6009,6 @@ EOS
'leapp_repo_prod', # This is the repo name for the production repo.
'leapp_repo_beta', # This is the repo name for the beta repo. The OS might not provide a beta repo in which case it'll be blank.
'is_supported', # This is used to determine if the OS is supported or not
'leapp_can_handle_epel', # This is used to determine if we can skip removing the EPEL repo pre_leapp or not
'leapp_can_handle_imunify', # This is used to determine if we can skip the Imunify component or not
'leapp_can_handle_kernelcare', # This is used to determine if we can skip the kernelcare component or not
'leapp_data_pkg', # This is used to determine which leapp data package to install
Expand Down Expand Up @@ -6120,7 +6109,6 @@ EOS
use constant elevate_rpm_url => 'https://repo.cloudlinux.com/elevate/elevate-release-latest-el7.noarch.rpm';
use constant leapp_repo_prod => 'elevate';
use constant leapp_repo_beta => 'elevate-updates-testing';
use constant leapp_can_handle_epel => 1;
use constant leapp_can_handle_imunify => 1;
use constant leapp_can_handle_kernelcare => 1;
use constant leapp_data_pkg => 'leapp-data-cloudlinux';
Expand Down Expand Up @@ -6217,7 +6205,6 @@ EOS
use constant ea_alias => undef;
use constant elevate_rpm_url => undef;
use constant is_supported => 1;
use constant leapp_can_handle_epel => 0;
use constant leapp_can_handle_imunify => 0;
use constant leapp_can_handle_kernelcare => 0;
use constant leapp_data_package => undef;
Expand Down
10 changes: 0 additions & 10 deletions lib/Elevate/Components/Repositories.pm
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ use parent qw{Elevate::Components::Base};

sub pre_leapp ($self) {

$self->run_once("_disable_epel");
$self->run_once("_disable_yum_plugin_fastestmirror");
$self->run_once("_disable_known_yum_repositories");

Expand Down Expand Up @@ -58,15 +57,6 @@ sub _disable_yum_plugin_fastestmirror ($self) {
return;
}

sub _disable_epel ($self) {

return if Elevate::OS::leapp_can_handle_epel();

my $pkg = 'epel-release';
$self->_erase_package($pkg);
return;
}

sub _erase_package ( $self, $pkg ) {
return unless Cpanel::Pkgr::is_installed($pkg);
$self->rpm->remove_no_dependencies($pkg);
Expand Down
1 change: 0 additions & 1 deletion lib/Elevate/OS.pm
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ BEGIN {
'leapp_repo_prod', # This is the repo name for the production repo.
'leapp_repo_beta', # This is the repo name for the beta repo. The OS might not provide a beta repo in which case it'll be blank.
'is_supported', # This is used to determine if the OS is supported or not
'leapp_can_handle_epel', # This is used to determine if we can skip removing the EPEL repo pre_leapp or not
'leapp_can_handle_imunify', # This is used to determine if we can skip the Imunify component or not
'leapp_can_handle_kernelcare', # This is used to determine if we can skip the kernelcare component or not
'leapp_data_pkg', # This is used to determine which leapp data package to install
Expand Down
1 change: 0 additions & 1 deletion lib/Elevate/OS/CloudLinux7.pm
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ use constant ea_alias => 'CloudLinux_8';
use constant elevate_rpm_url => 'https://repo.cloudlinux.com/elevate/elevate-release-latest-el7.noarch.rpm';
use constant leapp_repo_prod => 'elevate';
use constant leapp_repo_beta => 'elevate-updates-testing';
use constant leapp_can_handle_epel => 1;
use constant leapp_can_handle_imunify => 1;
use constant leapp_can_handle_kernelcare => 1;
use constant leapp_data_pkg => 'leapp-data-cloudlinux';
Expand Down
1 change: 0 additions & 1 deletion lib/Elevate/OS/RHEL.pm
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ use constant default_upgrade_to => undef;
use constant ea_alias => undef;
use constant elevate_rpm_url => undef;
use constant is_supported => 1;
use constant leapp_can_handle_epel => 0;
use constant leapp_can_handle_imunify => 0;
use constant leapp_can_handle_kernelcare => 0;
use constant leapp_data_package => undef;
Expand Down

0 comments on commit eb218fe

Please sign in to comment.