Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

drop EL8 support from our codebase #2106

Merged
merged 2 commits into from
Aug 15, 2024
Merged

drop EL8 support from our codebase #2106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c46aa9c
drop EL8 support from our codebase
evgeni Jul 9, 2024
8f561f4
replace screen with tmux
evgeni Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions puppet/modules/awstats/manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@
'yum',
]
) {
if $facts['os']['name'] == 'CentOS' and $facts['os']['release']['major'] == '8' {
# https://bugzilla.redhat.com/show_bug.cgi?id=1925801
# powertools provides perl(Switch)
yumrepo { 'powertools':
enabled => '1',
before => Package['awstats'],
}
}

package { 'awstats':
ensure => present,
}
Expand Down
2 changes: 1 addition & 1 deletion puppet/modules/jenkins_node/manifests/packaging/rpm.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
String $user,
Stdlib::Absolutepath $workspace,
) {
$ansible_python_version = if $facts['os']['release']['major'] == '8' { 'python3.12' } else { 'python3' }
$ansible_python_version = 'python3'

package { ['rpm-build', 'createrepo', 'copr-cli', 'rpmlint']:
ensure => installed,
Expand Down
4 changes: 1 addition & 3 deletions puppet/modules/utility/manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@

stdlib::ensure_packages([$vim])

unless $facts['os']['family'] == 'RedHat' and $facts['os']['release']['major'] == '8' {
stdlib::ensure_packages(['htop', 'iftop', 'screen'])
}
stdlib::ensure_packages(['htop', 'iftop', 'tmux'])

stdlib::ensure_packages(['rsync'])

Expand Down
2 changes: 1 addition & 1 deletion puppet/spec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ def on_supported_os(opts = {})
opts[:supported_os] ||= [
{
'operatingsystem' => 'CentOS',
'operatingsystemrelease' => ['7', '8', '9'],
'operatingsystemrelease' => ['7', '9'],
},
{
'operatingsystem' => 'Debian',
Expand Down