puppet_metadata 1.3.0 → 1.4.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: 1812a9565d5558aea69c47b403fd31788417b995ad8c4ef5349ddee10d18529c
4
- data.tar.gz: 54dda6a4915469ce27d0d2b9a1c43fbcee5cfdc2314dfc3fa8358afca9d303da
3
+ metadata.gz: 747e0f610eab5945e5394f6a8016b0208c9be6192dba0ebeca8a54adc50905f1
4
+ data.tar.gz: 7f1faa8c180dab26899c9664cb43c0990fb0f8d416d768d7542cd936d086b0b6
5
5
  SHA512:
6
- metadata.gz: 49675f7c180f2300e05c3018cb6d0c9f064d74b5f95fee222d73e7f83c385a8b4a839779462163a11022f9c700d115839c1d79d239a0f5988a1cbf5c3dea344d
7
- data.tar.gz: be883a1b3af62b048436c263afd6dc4a0963fc5345d9a8e69f63af96e52f84670c5ec1d63ef212a371ed2044f62e21f2c5a49e9016f0c1c108083a12efbd7a7e
6
+ metadata.gz: 4572e37f989abc32cc51393c588e26c513afff9c497ca11f07cbe7897e6ea02399728b8354d5dd4b0268cf762693deff46482e0b2940e5c026a9931513045bfe
7
+ data.tar.gz: 8c72e2c47b3a52d7bb478df00e106e484446a146d23281c61a04ba3cbe77e1f69ffa9cc531c8b218a4b62c1c038de7bd325910362157634789af1fed999e694e
@@ -65,7 +65,7 @@ module PuppetMetadata
65
65
  # Return whether a Beaker setfile can be generated for the given OS
66
66
  # @param [String] os The operating system
67
67
  def os_supported?(os)
68
- ['CentOS', 'Fedora', 'Debian', 'Ubuntu'].include?(os)
68
+ ['Archlinux', 'CentOS', 'Fedora', 'Debian', 'Ubuntu'].include?(os)
69
69
  end
70
70
 
71
71
  private
@@ -52,25 +52,42 @@ module PuppetMetadata
52
52
  end.compact
53
53
  end
54
54
 
55
- def github_action_test_matrix(use_fqdn: false, pidfile_workaround: false)
56
- metadata.operatingsystems.each_with_object([]) do |(os, releases), matrix_include|
57
- releases&.each do |release|
58
- puppet_major_versions.each do |puppet_version|
59
- next unless AIO.has_aio_build?(os, release, puppet_version[:value])
60
-
61
- setfile = PuppetMetadata::Beaker.os_release_to_setfile(os, release, use_fqdn: use_fqdn, pidfile_workaround: pidfile_workaround)
62
- next unless setfile
55
+ def beaker_os_releases
56
+ majors = puppet_major_versions
63
57
 
64
- matrix_include << {
65
- setfile: {
66
- name: setfile[1],
67
- value: setfile[0],
68
- },
69
- puppet: puppet_version
70
- }
58
+ metadata.operatingsystems.each do |os, releases|
59
+ case os
60
+ when 'Archlinux', 'Gentoo'
61
+ yield [os, 'rolling', majors.max_by { |v| v[:value] }]
62
+ else
63
+ releases&.each do |release|
64
+ majors.each do |puppet_version|
65
+ if AIO.has_aio_build?(os, release, puppet_version[:value])
66
+ yield [os, release, puppet_version]
67
+ end
68
+ end
71
69
  end
72
70
  end
73
71
  end
74
72
  end
73
+
74
+ def github_action_test_matrix(use_fqdn: false, pidfile_workaround: false)
75
+ matrix_include = []
76
+
77
+ beaker_os_releases do |os, release, puppet_version|
78
+ setfile = PuppetMetadata::Beaker.os_release_to_setfile(os, release, use_fqdn: use_fqdn, pidfile_workaround: pidfile_workaround)
79
+ next unless setfile
80
+
81
+ matrix_include << {
82
+ setfile: {
83
+ name: setfile[1],
84
+ value: setfile[0],
85
+ },
86
+ puppet: puppet_version
87
+ }
88
+ end
89
+
90
+ matrix_include
91
+ end
75
92
  end
76
93
  end
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: 1.3.0
4
+ version: 1.4.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: 2022-02-07 00:00:00.000000000 Z
12
+ date: 2022-02-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: metadata-json-lint