beaker-hostgenerator 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 989df830d08bfb7726aaf9ec65529668898cda03efe855b1627f31185c66680a
-  data.tar.gz: 274abeb00d5230dd22125fd8bfc4a50901a76dbd2cec5b2c646c1eae60aa28a3
+  metadata.gz: f66ec9e9bd76078ef767cc152a9d22930c9cb20cd15c856e43149ccf87c04dc1
+  data.tar.gz: e9c0cda19a2cf2381b0e609e1a1aff9c2cd0dbc895b809fca0649556d306a1aa
 SHA512:
-  metadata.gz: b1edd1be82dfc67db26c277b95880df4da410cb90083f80d0a146e39b5104b4c3d62e0e4dd974d2fa333d78871bec3baa1c3128c3c4e9d1a4da1d14730f6d6db
-  data.tar.gz: 8768bc0e4ddbac23d5fe918943b4560d605f4dc6386ef100d07af508340b5f5052e849b55d1e1c4fafa0a28686770f5a56973ff0c003c8df7c94e92f3a97364c
+  metadata.gz: 91cf25527d7f1fc7dc5de73929e3a774d5e1bdc8c934c267419501845a011e3c752b8fe3484ba661de49f47ba9318e5d6f18d80223ffcb2ccb5ace5aa21dfc2a
+  data.tar.gz: 2f49add8f297dd0938a63c7ff2f2b6300e0d8ba0a0bc3498035aefc81747a0ee6ea12adc96eacfa186735bb496be4b8676226f4b6b0eb22ca8343473b6803b9e

data/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.5.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.5.0) (2021-06-14)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.4.0...1.5.0)
+
+**Implemented enhancements:**
+
+- Ensure amd64 containers are pulled when needed [\#214](https://github.com/voxpupuli/beaker-hostgenerator/pull/214) ([genebean](https://github.com/genebean))
+- Add Fedora 34 support [\#212](https://github.com/voxpupuli/beaker-hostgenerator/pull/212) ([GabrielNagy](https://github.com/GabrielNagy))
+
+**Fixed bugs:**
+
+- Fix oracle image name [\#215](https://github.com/voxpupuli/beaker-hostgenerator/pull/215) ([genebean](https://github.com/genebean))
+- Avoid activesupport deep\_merge conflict [\#213](https://github.com/voxpupuli/beaker-hostgenerator/pull/213) ([GabrielNagy](https://github.com/GabrielNagy))
+
 ## [1.4.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.4.0) (2021-05-11)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.3.0...1.4.0)

data/lib/beaker-hostgenerator/data.rb

@@ -83,7 +83,7 @@ module BeakerHostGenerator
       result = {}
 
       # Fedora
-      (19..33).each do |release|
+      (19..34).each do |release|
         # 32 bit support was dropped in Fedora 31
         if release < 31
           result["fedora#{release}-32"] = {
@@ -1924,9 +1924,9 @@ module BeakerHostGenerator
     def get_osinfo(bhg_version)
       case bhg_version
       when 0
-        {}.deep_merge!(osinfo)
+        {}.deeper_merge!(osinfo)
       when 1
-        {}.deep_merge!(osinfo).deep_merge!(osinfo_bhgv1)
+        {}.deeper_merge!(osinfo).deeper_merge!(osinfo_bhgv1)
       else
         raise "Invalid beaker-hostgenerator version: #{bhg_version}"
       end
@@ -1970,10 +1970,7 @@ module BeakerHostGenerator
     #         }
     def get_platform_info(bhg_version, platform, hypervisor)
       info = get_osinfo(bhg_version)[platform]
-      result = {}
-      result.deep_merge!(info[:general]) if info[:general]
-      result.deep_merge!(info[hypervisor]) if info[hypervisor]
-      result
+      {}.deeper_merge!(info[:general]).deeper_merge!(info[hypervisor])
     end
 
     # Perform any adjustments or modifications necessary to the given node

data/lib/beaker-hostgenerator/generator.rb

@@ -22,7 +22,7 @@ module BeakerHostGenerator
     def generate(layout, options)
       layout = prepare(layout)
       tokens = tokenize_layout(layout)
-      config = {}.deep_merge(BASE_CONFIG)
+      config = {}.deeper_merge(BASE_CONFIG)
       nodeid = Hash.new(1)
       ostype = nil
       bhg_version = options[:osinfo_version] || 0
@@ -51,7 +51,7 @@ module BeakerHostGenerator
         # Delegate to the hypervisor
         hypervisor = BeakerHostGenerator::Hypervisor.create(node_info, options)
         host_config = hypervisor.generate_node(node_info, host_config, bhg_version)
-        config['CONFIG'].deep_merge!(hypervisor.global_config())
+        config['CONFIG'].deeper_merge!(hypervisor.global_config())
 
         # Merge in any arbitrary key-value host settings. Treat the 'hostname'
         # setting specially, and don't merge it in as an arbitrary setting.
@@ -80,7 +80,7 @@ module BeakerHostGenerator
           decoded = "{#{decoded}}"
         end
         global_config = settings_string_to_map(decoded)
-        config['CONFIG'].deep_merge!(global_config)
+        config['CONFIG'].deeper_merge!(global_config)
       end
 
       # Munge non-string scalar values into proper data types
@@ -117,7 +117,7 @@ module BeakerHostGenerator
 
       if not options[:disable_role_config]
         host_config['roles'].each do |role|
-          host_config.deep_merge! get_role_config(role)
+          host_config.deeper_merge! get_role_config(role)
         end
       end
     end

data/lib/beaker-hostgenerator/hypervisor.rb

@@ -94,7 +94,7 @@ module BeakerHostGenerator
       def base_generate_node(node_info, base_config, bhg_version, *hypervisors)
         platform = node_info['platform']
         hypervisors.map do |hypervisor|
-          base_config.deep_merge! get_platform_info(bhg_version, platform, hypervisor)
+          base_config.deeper_merge! get_platform_info(bhg_version, platform, hypervisor)
         end
 
         base_config['hypervisor'] = @name

data/lib/beaker-hostgenerator/hypervisor/abs.rb

@@ -1,6 +1,6 @@
 require 'beaker-hostgenerator/data'
 require 'beaker-hostgenerator/hypervisor'
-require 'deep_merge'
+require 'deep_merge/rails_compat'
 
 module BeakerHostGenerator
   module Hypervisor

data/lib/beaker-hostgenerator/hypervisor/docker.rb

@@ -1,6 +1,6 @@
 require 'beaker-hostgenerator/data'
 require 'beaker-hostgenerator/hypervisor'
-require 'deep_merge'
+require 'deep_merge/rails_compat'
 
 module BeakerHostGenerator
   module Hypervisor
@@ -10,8 +10,12 @@ module BeakerHostGenerator
       def generate_node(node_info, base_config, bhg_version)
         base_config['docker_cmd'] = ['/sbin/init']
         base_config['image'] = node_info['ostype'].sub(/(\d)/, ':\1')
+        base_config['image'].sub!(/\w+/, 'oraclelinux') if node_info['ostype'] =~ /^oracle/
         base_config['image'].sub!(/(\w+)/, '\1/leap') if node_info['ostype'] =~ /^opensuse/
         base_config['image'].sub!(/(\d{2})/, '\1.') if node_info['ostype'] =~ /^ubuntu/
+        if node_info['bits'] == '64'
+          base_config['image'] = "amd64/#{base_config['image']}"
+        end
 
         return base_generate_node(node_info, base_config, bhg_version, :docker)
       end

data/lib/beaker-hostgenerator/hypervisor/unknown.rb

@@ -1,6 +1,6 @@
 require 'beaker-hostgenerator/hypervisor'
 require 'beaker-hostgenerator/data'
-require 'deep_merge'
+require 'deep_merge/rails_compat'
 
 module BeakerHostGenerator::Hypervisor
   class Unknown < BeakerHostGenerator::Hypervisor::Interface

data/lib/beaker-hostgenerator/hypervisor/vagrant.rb

@@ -1,6 +1,6 @@
 require 'beaker-hostgenerator/data'
 require 'beaker-hostgenerator/hypervisor'
-require 'deep_merge'
+require 'deep_merge/rails_compat'
 
 module BeakerHostGenerator
   module Hypervisor

data/lib/beaker-hostgenerator/hypervisor/vmpooler.rb

@@ -1,6 +1,6 @@
 require 'beaker-hostgenerator/data'
 require 'beaker-hostgenerator/hypervisor'
-require 'deep_merge'
+require 'deep_merge/rails_compat'
 
 module BeakerHostGenerator
   module Hypervisor

data/lib/beaker-hostgenerator/util.rb

@@ -1,7 +1,7 @@
 require 'beaker-hostgenerator/data'
 require 'beaker-hostgenerator/roles'
 require 'beaker-hostgenerator/hypervisor/vmpooler'
-require 'deep_merge'
+require 'deep_merge/rails_compat'
 
 module BeakerHostGenerator
   module Utils
@@ -18,8 +18,8 @@ module BeakerHostGenerator
     def dump_hosts(hosts, path)
       vmpooler_hypervisor = BeakerHostGenerator::Hypervisor::Vmpooler.new
       config = {}
-      config.deep_merge! BeakerHostGenerator::Data.BASE_CONFIG
-      config['CONFIG'].deep_merge! vmpooler_hypervisor.global_config()
+      config.deeper_merge! BeakerHostGenerator::Data.BASE_CONFIG
+      config['CONFIG'].deeper_merge! vmpooler_hypervisor.global_config()
 
       hosts.each do |host|
         config['HOSTS'][host.node_name] = {

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '1.4.0'
+    STRING = '1.5.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-11 00:00:00.000000000 Z
+date: 2021-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest