beaker-hostgenerator 1.2.10 → 1.6.0

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
@@ -20,7 +20,32 @@ module BeakerHostGenerator
         # any given platform will have *either* :vmpooler data or :abs data
         # so we're not worried about one overriding the other when we merge
         # the hashes together.
-        return base_generate_node(node_info, base_config, bhg_version, :vmpooler, :abs)
+        base_config = base_generate_node(node_info, base_config, bhg_version, :vmpooler, :abs)
+
+        case node_info['ostype']
+        when /^centos/
+          base_config['template'] = base_config['platform'].gsub(/^el/, 'centos')
+        when /^fedora/
+          base_config['template'] = base_config['platform']
+        when /^ubuntu/
+          base_template = node_info['ostype'].sub('ubuntu', 'ubuntu-')
+          arch = case node_info['bits']
+                 when '64'
+                   'x86_64'
+                 when '32'
+                   'i386'
+                 when 'AARCH64'
+                   'arm64'
+                 when 'POWER'
+                   base_template = node_info['ostype'].sub(/ubuntu(\d\d)/, 'ubuntu-\1.')
+                   'power8'
+                 else
+                   raise "Unknown bits '#{node_info['bits']}' for '#{node_info['ostype']}'"
+                 end
+          base_config['template'] = "#{base_template}-#{arch}"
+        end
+
+        base_config
       end
     end
   end

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,7 +10,39 @@ 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
+
+        docker_commands = []
+
+        case node_info['ostype']
+        when /^ubuntu/
+          docker_commands << 'cp /bin/true /sbin/agetty'
+
+          if node_info['ostype'] =~ /1404/
+            docker_commands << 'rm /usr/sbin/policy-rc.d'
+            docker_commands << 'rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl'
+          end
+
+          extra_packages_to_install = case node_info['ostype']
+                                      when /1404/
+                                        ['apt-transport-https']
+                                      when /1604/
+                                        ['locales']
+                                      else
+                                        ['locales', 'iproute2', 'gnupg']
+                                      end
+
+          docker_commands << "apt-get install -y net-tools wget #{extra_packages_to_install.join(' ')}"
+          docker_commands << 'locale-gen en_US.UTF-8'
+          docker_commands << 'echo LANG=en_US.UTF-8 > /etc/default/locale'
+
+          base_config['docker_image_commands'] = docker_commands
+        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
@@ -8,7 +8,7 @@ module BeakerHostGenerator
       include BeakerHostGenerator::Data
 
       # default global configuration keys
-      def global_config()
+      def global_config
         {
           'pooling_api' => 'http://vmpooler.delivery.puppetlabs.net/'
         }
@@ -17,6 +17,24 @@ module BeakerHostGenerator
       def generate_node(node_info, base_config, bhg_version)
         base_config = base_generate_node(node_info, base_config, bhg_version, :vmpooler)
 
+        case node_info['ostype']
+        when /^centos/
+          base_config['template'] = base_config['platform'].gsub(/^el/, 'centos')
+        when /^fedora/
+          base_config['template'] = base_config['platform']
+        when /^ubuntu/
+          arch = case node_info['bits']
+                 when '64'
+                   'x86_64'
+                 when '32'
+                   'i386'
+                 else
+                   nil
+                 end
+
+          base_config['template'] = "#{node_info['ostype'].sub('ubuntu', 'ubuntu-')}-#{arch}" if arch
+        end
+
         # Some vmpooler/vsphere platforms have special requirements.
         # We munge the node host config here if that is necessary.
         fixup_node base_config

data/lib/beaker-hostgenerator/parser.rb

@@ -1,6 +1,6 @@
 require 'beaker-hostgenerator/data'
 require 'beaker-hostgenerator/exceptions'
-require 'uri'
+require 'cgi'
 
 module BeakerHostGenerator
   # Functions for parsing the raw user input host layout string and turning
@@ -75,7 +75,7 @@ module BeakerHostGenerator
     # @returns [String] Input string with transformations necessary for
     #                   tokenization.
     def prepare(spec)
-      URI.decode(spec)
+      CGI.unescape(spec)
     end
 
     # Breaks apart the host input string into chunks suitable for processing
@@ -260,7 +260,7 @@ module BeakerHostGenerator
           current_depth = current_depth.pred
           next
         end
-        
+
         # When there is assignment happening, we need to create a new
         # corresponding data structure, add it to the object depth, and
         # then change the current depth

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.2.10'
+    STRING = '1.6.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.6.0
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-20 00:00:00.000000000 Z
+date: 2021-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -58,36 +58,36 @@ dependencies:
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.6'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.14.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -185,10 +185,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/workflows/release.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".simplecov"
-- ".travis.yml"
 - CHANGELOG.md
 - CODEOWNERS
 - CONTRIBUTING.md
@@ -235,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Beaker Host Generator Utility

data/.travis.yml

@@ -1,10 +0,0 @@
-before_install:
-  - gem update
-  - gem --version
-language: ruby
-script: "bundle exec rake test:spec"
-notifications:
-  email: false
-rvm:
-  - 2.6
-  - 2.4