puppet_metadata 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b9da6033c7aa055e1e88289211ad3356764ea737184fd594fce1c31e1e94c27
-  data.tar.gz: 8fdfd523619505b15568769eb276424cffcc5c257c3a08377ee8a7abd8571701
+  metadata.gz: dd0637a24f15f5fbe1876402af082cfdb245d68683de8397dd11703cdc996788
+  data.tar.gz: 5ec9738ce657cc4dba65d4af0a4b40093acdd934fcf1d302001efae788633fdd
 SHA512:
-  metadata.gz: 574fb26918bdd3c5b7a7ccad604557cb130797f704c87102d552fe3ef5a121acd15d4be22ba67bd273ba3d0d35a4c5b44c1ed8fe48e09b019da3785f9a149a9f
-  data.tar.gz: fcf0a1b46a59fdfbd3f6269f430495a63acbfc387c187658b25b4466fd8c0a0b5835cf221a5f6b7fcfdcd8f15208ab28141815edb8701666f9cefc47a422f99b
+  metadata.gz: 444af6b66b4dc964b254767c1f8fed67219e7e0d7e8504318700d50f3cca7e2cba367b32a75c871b36b1089a65af016322522086b6d0a197658f34b70f175520
+  data.tar.gz: 873eb62634fb24e2a904225ceb730e1349c8f216a475e530601b1724d7bc35ad08c6e34b9ef3afe38f5cfb8dabcb64bbaab74a04dbae75e7d8f323c6f40652c8

data/lib/puppet_metadata/beaker.rb

@@ -12,13 +12,16 @@ module PuppetMetadata
     # @param [String] release The OS release
     # @param [Boolean] use_fqdn
     #   Whether or not to use a FQDN, ensuring a domain
-    # @param [Boolean] pidfile_workaround
+    # @param [Boolean, Array[String]] pidfile_workaround
     #   Whether or not to apply the systemd PIDFile workaround. This is only
     #   needed when the daemon uses PIDFile in its service file and using
     #   Docker as a Beaker hypervisor. This is to work around Docker's
     #   limitations.
+    #   When a boolean, it's applied on applicable operating systems. On arrays
+    #   it's applied only when os is included in the provided array.
     #
-    # @return [String] The beaker setfile description or nil
+    # @return [nil] If no setfile is available
+    # @return [Array<(String, String)>] The beaker setfile description with a readable name
     def self.os_release_to_setfile(os, release, use_fqdn: false, pidfile_workaround: false)
       return unless os_supported?(os)
 
@@ -26,12 +29,20 @@ module PuppetMetadata
 
       options = {}
       options[:hostname] = "#{name}.example.com" if use_fqdn
+
       # Docker messes up cgroups and modern systemd can't deal with that when
       # PIDFile is used.
-      if pidfile_workaround
+      if pidfile_workaround && (!pidfile_workaround.is_a?(Array) || pidfile_workaround.include?(os))
         case os
         when 'CentOS'
-          options[:image] = 'centos:7.6.1810' if release == '7'
+          case release
+          when '7'
+            options[:image] = 'centos:7.6.1810'
+          when '8'
+            # There is no CentOS 8 image that works with PIDFile in systemd
+            # unit files
+            return
+          end
         when 'Ubuntu'
           options[:image] = 'ubuntu:xenial-20191212' if release == '16.04'
         end
@@ -39,7 +50,10 @@ module PuppetMetadata
 
       setfile = name
       setfile += "{#{options.map { |key, value| "#{key}=#{value}" }.join(',')}}" if options.any?
-      setfile
+
+      human_name = "#{os} #{release}"
+
+      [setfile, human_name]
     end
 
     # Return whether a Beaker setfile can be generated for the given OS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppet_metadata
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Vox Pupuli
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-18 00:00:00.000000000 Z
+date: 2020-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metadata-json-lint
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Data structures for the Puppet Metadata