puppet_metadata 3.1.0 → 3.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1ee295ef02bb87ed87b68f0ebe2fea5813fff4e5316a5ffab59dee9bea6bb36f
4
- data.tar.gz: 150eb04c272910087f6687f96e6673fd9dd616697b2f6779c87d06935ec83ddb
3
+ metadata.gz: d41190de113b3a8b9f44f2f627fe9f67c1dcfc9886d674b69287f1adbef9ce06
4
+ data.tar.gz: 1bb3c2e083ae08867f9baf04e901f1271f0d5f4b8bb088e74db6b1004062a572
5
5
  SHA512:
6
- metadata.gz: 0aabfd90159725ac7c7029ccede234ec4d5351229293a32de1f37dbf3e34a05293cf07e4f7df79aef84b7c7ea686774f616f39086c18bad588c283bc14fa8d31
7
- data.tar.gz: ebd5f32841912550eaab333eacd9259de97ef9c7583591e71ba417f8bc1e191ba25a66325503c05747c3619745b8427f1d932d42f5951e59eecf5383b708c089
6
+ metadata.gz: 18f0597d9195fe59dbc21e719a65d4e251a67e91dc33e4fc6db575b7ab67f26fe21c4f5e1ebcfe86edec63aaad631cf4376b90dda32c4042569bf8cbb91c8d4f
7
+ data.tar.gz: 3f8f49b5f3a552a22622740bc13a400846b8c0093ec8d2f5987fe5513a6314c924c405d013da6ce7c89879c9502627dcbd952cdb9ba42d39eaa67ad582e64e94
@@ -21,6 +21,18 @@ module PuppetMetadata
21
21
  'CentOS' => ['8'],
22
22
  }.freeze
23
23
  class << self
24
+ # modifies the operating system name to suit beaker-hostgenerator
25
+ # @param [String] os
26
+ # @return [String] the modified OS name
27
+ def adjusted_os(os)
28
+ case os
29
+ when 'OracleLinux'
30
+ 'oracle'
31
+ else
32
+ os.downcase
33
+ end
34
+ end
35
+
24
36
  # Convert an Operating System name with a release to a Beaker setfile
25
37
  #
26
38
  # @param [String] os
@@ -46,7 +58,9 @@ module PuppetMetadata
46
58
  def os_release_to_setfile(os, release, use_fqdn: false, pidfile_workaround: false, domain: nil, puppet_version: nil)
47
59
  return unless os_supported?(os)
48
60
 
49
- name = "#{os.downcase}#{release.tr('.', '')}-64"
61
+ aos = adjusted_os(os)
62
+
63
+ name = "#{aos}#{release.tr('.', '')}-64"
50
64
  hostname = (puppet_version.nil? && puppet_version != 'none') ? name : "#{name}-#{puppet_version}"
51
65
  domain ||= 'example.com' if use_fqdn
52
66
 
@@ -71,7 +85,7 @@ module PuppetMetadata
71
85
  # Return whether a Beaker setfile can be generated for the given OS
72
86
  # @param [String] os The operating system
73
87
  def os_supported?(os)
74
- %w[Archlinux CentOS Fedora Debian Ubuntu Rocky AlmaLinux].include?(os)
88
+ %w[Archlinux CentOS Fedora Debian Ubuntu Rocky AlmaLinux OracleLinux].include?(os)
75
89
  end
76
90
 
77
91
  private
@@ -81,6 +81,7 @@ module PuppetMetadata
81
81
  next if puppet_version_below_minimum?(puppet_version[:value])
82
82
 
83
83
  matrix_include << {
84
+ name: "#{puppet_version[:name]} - #{setfile[1]}",
84
85
  setfile: {
85
86
  name: setfile[1],
86
87
  value: setfile[0],
@@ -45,6 +45,12 @@ module PuppetMetadata
45
45
  '2.2' => '2003-06-30',
46
46
  '2.1' => '2000-09-30',
47
47
  },
48
+ # https://endoflife.date/oraclelinux
49
+ 'OracleLinux' => {
50
+ '9' => '2032-06-30',
51
+ '8' => '2029-07-01',
52
+ '7' => '2024-07-01',
53
+ },
48
54
  # https://endoflife.software/operating-systems/linux/fedora
49
55
  'Fedora' => {
50
56
  '32' => nil,
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: puppet_metadata
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.1.0
4
+ version: 3.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Vox Pupuli
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2023-07-24 00:00:00.000000000 Z
12
+ date: 2023-10-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: metadata-json-lint
@@ -20,7 +20,7 @@ dependencies:
20
20
  version: '2.0'
21
21
  - - "<"
22
22
  - !ruby/object:Gem::Version
23
- version: '4'
23
+ version: '5'
24
24
  type: :runtime
25
25
  prerelease: false
26
26
  version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
30
30
  version: '2.0'
31
31
  - - "<"
32
32
  - !ruby/object:Gem::Version
33
- version: '4'
33
+ version: '5'
34
34
  - !ruby/object:Gem::Dependency
35
35
  name: semantic_puppet
36
36
  requirement: !ruby/object:Gem::Requirement