beaker-hostgenerator 1.17.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f9f72385b498796e24c6b39c8b361d1f682380c43e09a546212705872c70d8
-  data.tar.gz: b6c5b7e338501c799cba250c6e93f79355f963be691b2dab402f19f4a8b3ef85
+  metadata.gz: 99de0611f4a7330a169bc12359213635eadc4e820fea6d860727d5f74d0f3043
+  data.tar.gz: 7eceed33b7804cab7f940b77cee75d0c0a1e54de625e5908b3ee4eca19ba0b1b
 SHA512:
-  metadata.gz: 2c9a8b6ad903b0e745bb4f7a96061a9f9de1ee0ea7c1e7f57cd6d5a9f8dd8d87a6fd54bc4e3d94638fa11efa533f916dfd6a5acdd7c9d327928a942fb75eedfc
-  data.tar.gz: b94b8f1a329c7d0ad6c9b71164c6d72af429fd80d2496c8138bbe2efdeef544723d74838940a3106a15ae54474bcd88338426a2848fbdf4e651980f4594e8cc8
+  metadata.gz: a2e3a91bdca8780e3679a0f24b88c8e48517da3d4209579433a348010a2a0213bd2a25d4a4d8b6fabbde33e5e5c12c30c48121aa0fd314c209858c0d12a7cb59
+  data.tar.gz: b534f3e88f5fc4f90f1d517ea00e13f9caa30d665abaf5ceea15dcd604df8977487b356eac41fefeea3d0d65e10407900250f0081fe4c4e8b499ec8773b52dcb

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.18.1](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.18.1) (2022-12-14)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.18.0...1.18.1)
+
+**Fixed bugs:**
+
+- AlmaLinux: Fix docker image names [\#265](https://github.com/voxpupuli/beaker-hostgenerator/pull/265) ([bastelfreak](https://github.com/bastelfreak))
+- RockyLinux: Fix docker image names [\#264](https://github.com/voxpupuli/beaker-hostgenerator/pull/264) ([bastelfreak](https://github.com/bastelfreak))
+
+## [1.18.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.18.0) (2022-12-12)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.17.0...1.18.0)
+
+**Implemented enhancements:**
+
+- Add Almalinux/Rocky 9 support [\#262](https://github.com/voxpupuli/beaker-hostgenerator/pull/262) ([bastelfreak](https://github.com/bastelfreak))
+- Add hcloud support [\#261](https://github.com/voxpupuli/beaker-hostgenerator/pull/261) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [1.17.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.17.0) (2022-09-12)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.16.0...1.17.0)

data/README.md

@@ -42,9 +42,10 @@ information.
 
 It currently provides built-in configuration for Puppets' internal
 [vmpooler][vmpooler] hypervisor, [always-be-scheduling][always-be-scheduling]
-hypervisor, static (non-provisioned) nodes, and is designed in a way that makes
-it possible to easily add support for additional hypervisors
-(any hypervisor type supported by [beaker][beaker]).
+hypervisor, Vagrant with Virtualbox and Libvirt backend,
+[Hetzner cloud](https://www.hetzner.com/cloud), static (non-provisioned) nodes,
+and is designed in a way that makes it possible to easily add support for
+additional hypervisors (any hypervisor type supported by [beaker][beaker]).
 
 To see the list of built-in hypervisors you can run:
 ```

data/lib/beaker-hostgenerator/data.rb

@@ -194,6 +194,17 @@ module BeakerHostGenerator
             ]
           }
         },
+        'almalinux9-64' => {
+          :general => {
+            'platform' => 'el-9-x86_64',
+          },
+          :docker => {
+            'docker_image_commands' => [
+              'cp /bin/true /sbin/agetty',
+              'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
+            ]
+          }
+        },
         'amazon6-64' => {
             :general => {
                 'platform' => 'el-6-x86_64'
@@ -1057,6 +1068,17 @@ module BeakerHostGenerator
             ]
           }
         },
+        'rocky9-64' => {
+          :general => {
+            'platform' => 'el-9-x86_64',
+          },
+          :docker => {
+            'docker_image_commands' => [
+              'cp /bin/true /sbin/agetty',
+              'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
+            ]
+          }
+        },
         'scientific5-32' => {
           :general => {
             'platform' => 'el-5-i386'

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

@@ -10,9 +10,19 @@ 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/
+        case node_info['ostype']
+        when /^oracle/
+          base_config['image'].sub!(/\w+/, 'oraclelinux')
+        when /^opensuse/
+          base_config['image'].sub!(/(\w+)/, '\1/leap')
+        when /^ubuntu/
+          base_config['image'].sub!(/(\d{2})/, '\1.')
+        when /^rocky/
+          base_config['image'].sub!(/(\w+)/, 'rockylinux')
+        when /^alma/
+          base_config['image'].sub!(/(\w+)/, 'almalinux')
+        end
+
         if node_info['bits'] == '64'
           base_config['image'] = "amd64/#{base_config['image']}"
         end

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

@@ -0,0 +1,26 @@
+require 'beaker-hostgenerator/data'
+require 'beaker-hostgenerator/hypervisor'
+
+module BeakerHostGenerator
+  module Hypervisor
+
+    class Hcloud < BeakerHostGenerator::Hypervisor::Interface
+      include BeakerHostGenerator::Data
+
+      def generate_node(node_info, base_config, bhg_version)
+        # split ostype into string and array
+        # ostype is ubuntu2204, debian10, rocky9
+        os, version = node_info['ostype'].split(/(\D+)/).reject!(&:empty?)
+        base_config['image'] = case os
+        when 'ubuntu'
+          "#{os}-#{version[0, 2]}.#{version[2,2]}"
+        when 'centos'
+          version.to_i == 7 ? "#{os}-#{version}" : "#{os}-stream-#{version}"
+        else
+          "#{os}-#{version}"
+        end
+        return base_generate_node(node_info, base_config, bhg_version, :hcloud)
+      end
+    end
+  end
+end

data/lib/beaker-hostgenerator/hypervisor.rb

@@ -45,7 +45,8 @@ module BeakerHostGenerator
         'vagrant' => BeakerHostGenerator::Hypervisor::Vagrant,
         'vagrant_libvirt' => BeakerHostGenerator::Hypervisor::Vagrant,
         'docker' => BeakerHostGenerator::Hypervisor::Docker,
-        'abs' => BeakerHostGenerator::Hypervisor::ABS
+        'abs' => BeakerHostGenerator::Hypervisor::ABS,
+        'hcloud' => BeakerHostGenerator::Hypervisor::Hcloud,
       }
     end
 
@@ -114,3 +115,4 @@ require 'beaker-hostgenerator/hypervisor/vmpooler'
 require 'beaker-hostgenerator/hypervisor/vagrant'
 require 'beaker-hostgenerator/hypervisor/docker'
 require 'beaker-hostgenerator/hypervisor/abs'
+require 'beaker-hostgenerator/hypervisor/hcloud'

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '1.17.0'
+    STRING = '1.18.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.1
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-12 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -182,6 +182,7 @@ files:
 - lib/beaker-hostgenerator/hypervisor.rb
 - lib/beaker-hostgenerator/hypervisor/abs.rb
 - lib/beaker-hostgenerator/hypervisor/docker.rb
+- lib/beaker-hostgenerator/hypervisor/hcloud.rb
 - lib/beaker-hostgenerator/hypervisor/unknown.rb
 - lib/beaker-hostgenerator/hypervisor/vagrant.rb
 - lib/beaker-hostgenerator/hypervisor/vmpooler.rb