-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
RedHat 7 is excluded because the UBI yum repos are unable to resolve all EPEL dependencies (try installing nginx from epel).
- Loading branch information
Showing
1 changed file
with
10 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -19,6 +19,7 @@ class Beaker | |
# unit files | ||
PIDFILE_INCOMPATIBLE = { | ||
'CentOS' => ['8'], | ||
'RedHat' => ['8'], | ||
'AlmaLinux' => ['8'], | ||
'OracleLinux' => ['7', '8'], | ||
'Rocky' => ['8'], | ||
|
@@ -59,7 +60,7 @@ def adjusted_os(os) | |
# @return [nil] If no setfile is available | ||
# @return [Array<(String, String)>] The beaker setfile description with a readable name | ||
def os_release_to_setfile(os, release, use_fqdn: false, pidfile_workaround: false, domain: nil, puppet_version: nil) | ||
return unless os_supported?(os) | ||
return unless os_supported?(os, release) | ||
|
||
aos = adjusted_os(os) | ||
|
||
|
@@ -87,8 +88,14 @@ def os_release_to_setfile(os, release, use_fqdn: false, pidfile_workaround: fals | |
|
||
# Return whether a Beaker setfile can be generated for the given OS | ||
# @param [String] os The operating system | ||
def os_supported?(os) | ||
%w[Archlinux CentOS Fedora Debian Ubuntu Rocky AlmaLinux OracleLinux].include?(os) | ||
# @param [String] release The operating system release | ||
def os_supported?(os, release = nil) | ||
case os | ||
when 'RedHat' | ||
true if release !~ /^7/ | ||
Check failure on line 95 in lib/puppet_metadata/beaker.rb GitHub Actions / rubocop
|
||
when /^(Archlinux|CentOS|Fedora|Debian|Ubuntu|Rocky|AlmaLinux|OracleLinux)/ | ||
true | ||
end | ||
end | ||
|
||
private | ||
|