RubyGems - beaker-hostgenerator - Versions diffs - 3.3.0 → 3.4.0 - Mend

beaker-hostgenerator 3.3.0 → 3.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.

Files changed (12) hide show

checksums.yaml +4 -4
data/.github/workflows/release.yml +6 -6
data/.github/workflows/test.yml +5 -5
data/.rubocop.yml +0 -3
data/.rubocop_todo.yml +7 -6
data/CHANGELOG.md +15 -0
data/beaker-hostgenerator.gemspec +2 -2
data/lib/beaker-hostgenerator/data.rb +45 -227
data/lib/beaker-hostgenerator/hypervisor/abs.rb +20 -1
data/lib/beaker-hostgenerator/hypervisor/vmpooler.rb +29 -1
data/lib/beaker-hostgenerator/version.rb +1 -1
metadata +12 -6

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 960e75775e75d711fd5bc8ac6e631bc72b6ea681e5201f7ba2c90df7a622c11b
-  data.tar.gz: 9eb29be0b7d998a687eb139174d9fe2dc81e8800e6e101911b0bc9c6ff4246f6
+  metadata.gz: ba90981da63e88c468dd80004c4c6bad485110d6261b07dd00e66bdcf07b445d
+  data.tar.gz: f7e11d24ff7b3c4a113979cbf41bb25ae2833f6d3095311d436f05a5bd23c06e
 SHA512:
-  metadata.gz: 69ec59ae41a7785e9db639a851a374483967e89d360e18411f565bffd6b69403c45fa594e1d52ef9e2aee77b092980f5b209de0b8c7db013be0702e021c47a43
-  data.tar.gz: 8829f4b6717249bf052a1462fc37379fd7638e9a11b64b033e89ea5ffa3c2d09546c142603190536b16558a98197d8c5c8feb3455d4e84fcf1d163a18cf049f9
+  metadata.gz: cada79e670dae8986f80f5e2945a90ebab962cc38b85622cd49415e9112003ed38556498aa118b54889af8ce1046da447d2bd021c9302140a5e5da9b0f91e62f
+  data.tar.gz: 462e8c8c30428318d26bbede4284dd640736c4fde6dca64e3b4a0446f8000f3d1f4e0c82ccd65a193402ab9d9b4fb10c1c3cbcee12afb937a1647f3c2765930b

data/.github/workflows/release.yml CHANGED Viewed

@@ -15,7 +15,7 @@ jobs:
     name: Build the gem
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -24,7 +24,7 @@ jobs:
         shell: bash
         run: gem build --verbose *.gemspec
       - name: Upload gem to GitHub cache
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: gem-artifact
           path: '*.gem'
@@ -39,7 +39,7 @@ jobs:
       contents: write # clone repo and create release
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
         with:
           name: gem-artifact
       - name: Create Release
@@ -56,7 +56,7 @@ jobs:
       packages: write # publish to rubygems.pkg.github.com
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
         with:
           name: gem-artifact
       - name: Publish gem to GitHub packages
@@ -73,7 +73,7 @@ jobs:
       id-token: write # rubygems.org authentication
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
         with:
           name: gem-artifact
       - uses: rubygems/configure-rubygems-credentials@v1.0.0
@@ -92,7 +92,7 @@ jobs:
       - release-to-rubygems
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v7
         with:
           name: gem-artifact
       - name: Install Ruby

data/.github/workflows/test.yml CHANGED Viewed

@@ -15,16 +15,16 @@ jobs:
     outputs:
       ruby: ${{ steps.ruby.outputs.versions }}
     steps:
-      - uses: actions/checkout@v5
-      - name: Install Ruby 3.4
+      - uses: actions/checkout@v6
+      - name: Install Ruby 4.0
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.4'
+          ruby-version: '4.0'
           bundler-cache: true
       - name: Run RuboCop
         run: bundle exec rake rubocop
       - id: ruby
-        uses: voxpupuli/ruby-version@v1
+        uses: voxpupuli/ruby-version@v2
   test:
     name: "Ruby ${{ matrix.ruby }}"
@@ -35,7 +35,7 @@ jobs:
       matrix:
         ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Setup ruby
         uses: ruby/setup-ruby@v1
         with:

data/.rubocop.yml CHANGED Viewed

@@ -5,6 +5,3 @@ inherit_gem:
 Style/GuardClause:
   Enabled: False
-AllCops:
-  TargetRubyVersion: 3.2

data/.rubocop_todo.yml CHANGED Viewed

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-auto-gen-timestamp`
-# using RuboCop version 1.75.8.
+# using RuboCop version 1.81.7.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -60,7 +60,7 @@ Naming/HeredocDelimiterNaming:
 # ForbiddenPrefixes: is_, has_, have_, does_
 # AllowedMethods: is_a?
 # MethodDefinitionMacros: define_method, define_singleton_method
-Naming/PredicateName:
+Naming/PredicatePrefix:
   Exclude:
     - 'spec/**/*'
     - 'lib/beaker-hostgenerator/parser.rb'
@@ -100,9 +100,10 @@ RSpec/DescribedClass:
 RSpec/ExampleLength:
   Max: 35
-# Offense count: 7
-RSpec/MultipleExpectations:
-  Max: 4
+# Offense count: 1
+RSpec/LeakyLocalVariable:
+  Exclude:
+    - 'spec/beaker-hostgenerator/generator_spec.rb'
 # Offense count: 2
 # Configuration parameters: AllowSubject.
@@ -232,7 +233,7 @@ Style/StringConcatenation:
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 168

data/CHANGELOG.md CHANGED Viewed

@@ -2,6 +2,21 @@
 All notable changes to this project will be documented in this file.
+## [3.4.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/3.4.0) (2025-12-27)
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/3.3.0...3.4.0)
+**Implemented enhancements:**
+- Add Ruby 4.0 support [\#445](https://github.com/voxpupuli/beaker-hostgenerator/pull/445) ([bastelfreak](https://github.com/bastelfreak))
+- Add Amazonlinux 2023 support [\#440](https://github.com/voxpupuli/beaker-hostgenerator/pull/440) ([bastelfreak](https://github.com/bastelfreak))
+- Use a loop for SLES [\#433](https://github.com/voxpupuli/beaker-hostgenerator/pull/433) ([traylenator](https://github.com/traylenator))
+- Generate Rocky, Alma and RedHat dynamically [\#432](https://github.com/voxpupuli/beaker-hostgenerator/pull/432) ([traylenator](https://github.com/traylenator))
+**Merged pull requests:**
+- Remove debug statement [\#434](https://github.com/voxpupuli/beaker-hostgenerator/pull/434) ([ekohl](https://github.com/ekohl))
 ## [3.3.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/3.3.0) (2025-08-19)
 [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/3.2.1...3.3.0)

data/beaker-hostgenerator.gemspec CHANGED Viewed

@@ -23,12 +23,12 @@ Gem::Specification.new do |s|
   # Testing dependencies
   s.add_development_dependency 'fakefs', '>= 0.6', '< 4.0'
-  s.add_development_dependency 'minitest', '~> 5.18'
+  s.add_development_dependency 'minitest', '>= 5.18', '< 7'
   s.add_development_dependency 'pry', '~> 0.10'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'rspec-its', '>= 1.3.1', '< 3'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 4.2.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 5.1.0'
   # Run time dependencies
   s.add_dependency 'deep_merge', '~> 1.0'

data/lib/beaker-hostgenerator/data.rb CHANGED Viewed

@@ -123,6 +123,14 @@ module BeakerHostGenerator
                           'template' => 'amazon-7-arm64',
                         },
                       },
+                      'amazon2023-64' => {
+                        general: {
+                          'platform' => 'el-9-x86_64',
+                        },
+                        docker: {
+                          'image' => 'amazonlinux:2023',
+                        },
+                      },
                       'archlinuxrolling-64' => {
                         general: {
                           'platform' => 'archlinux-rolling-x64',
@@ -134,11 +142,6 @@ module BeakerHostGenerator
                           'image' => 'archlinux/archlinux',
                         },
                       },
-                      'redhat7-64' => {
-                        general: {
-                          'platform' => 'el-7-x86_64',
-                        },
-                      },
                       'redhatfips7-64' => {
                         general: {
                           'platform' => 'el-7-x86_64',
@@ -148,35 +151,6 @@ module BeakerHostGenerator
                           'template' => 'redhat-fips-7-x86_64',
                         },
                       },
-                      'redhat7-POWER' => {
-                        general: {
-                          'platform' => 'el-7-ppc64le',
-                        },
-                        abs: {
-                          'template' => 'redhat-7.3-power8',
-                        },
-                      },
-                      'redhat7-S390X' => {
-                        general: {
-                          'platform' => 'el-7-s390x',
-                        },
-                      },
-                      'redhat7-AARCH64' => {
-                        general: {
-                          'platform' => 'el-7-aarch64',
-                        },
-                        abs: {
-                          'template' => 'centos-7-arm64',
-                        },
-                        vmpooler: {
-                          'template' => 'redhat-7-x86_64',
-                        },
-                      },
-                      'redhat8-64' => {
-                        general: {
-                          'platform' => 'el-8-x86_64',
-                        },
-                      },
                       'redhatfips8-64' => {
                         general: {
                           'platform' => 'el-8-x86_64',
@@ -186,30 +160,6 @@ module BeakerHostGenerator
                           'template' => 'redhat-fips-8-x86_64',
                         },
                       },
-                      'redhat8-AARCH64' => {
-                        general: {
-                          'platform' => 'el-8-aarch64',
-                        },
-                        abs: {
-                          'template' => 'redhat-8-arm64',
-                        },
-                        vmpooler: {
-                          'template' => 'redhat-8-x86_64',
-                        },
-                      },
-                      'redhat8-POWER' => {
-                        general: {
-                          'platform' => 'el-8-ppc64le',
-                        },
-                        abs: {
-                          'template' => 'redhat-8-power8',
-                        },
-                      },
-                      'redhat9-64' => {
-                        general: {
-                          'platform' => 'el-9-x86_64',
-                        },
-                      },
                       'redhatfips9-64' => {
                         general: {
                           'platform' => 'el-9-x86_64',
@@ -219,174 +169,12 @@ module BeakerHostGenerator
                           'template' => 'redhat-fips-9-x86_64',
                         },
                       },
-                      'redhat9-AARCH64' => {
-                        general: {
-                          'platform' => 'el-9-aarch64',
-                        },
-                        abs: {
-                          'template' => 'redhat-9-arm64',
-                        },
-                        vmpooler: {
-                          'template' => 'redhat-9-arm64',
-                        },
-                      },
-                      'redhat10-64' => {
-                        general: {
-                          'platform' => 'el-10-x86_64',
-                        },
-                      },
-                      'redhat10-AARCH64' => {
-                        general: {
-                          'platform' => 'el-10-aarch64',
-                        },
-                        abs: {
-                          'template' => 'redhat-10-arm64',
-                        },
-                        vmpooler: {
-                          'template' => 'redhat-10-arm64',
-                        },
-                      },
-                      'rocky8-64' => {
-                        general: {
-                          'platform' => 'el-8-x86_64',
-                        },
-                      },
-                      'rocky9-64' => {
-                        general: {
-                          'platform' => 'el-9-x86_64',
-                        },
-                      },
-                      'rocky9-AARCH64' => {
-                        general: {
-                          'platform' => 'el-9-aarch64',
-                        },
-                        abs: {
-                          'template' => 'rocky-9-arm64',
-                        },
-                        vmpooler: {
-                          'template' => 'rocky-9-arm64',
-                        },
-                      },
-                      'rocky10-64' => {
-                        general: {
-                          'platform' => 'el-10-x86_64',
-                        },
-                      },
-                      'rocky10-AARCH64' => {
-                        general: {
-                          'platform' => 'el-10-aarch64',
-                        },
-                        abs: {
-                          'template' => 'rocky-10-arm64',
-                        },
-                        vmpooler: {
-                          'template' => 'rocky-10-arm64',
-                        },
-                      },
-                      'almalinux8-64' => {
-                        general: {
-                          'platform' => 'el-8-x86_64',
-                        },
-                      },
-                      'almalinux9-64' => {
-                        general: {
-                          'platform' => 'el-9-x86_64',
-                        },
-                      },
-                      'almalinux9-AARCH64' => {
-                        general: {
-                          'platform' => 'el-9-aarch64',
-                        },
-                        abs: {
-                          'template' => 'almalinux-9-arm64',
-                        },
-                        vmpooler: {
-                          'template' => 'almalinux-9-arm64',
-                        },
-                      },
-                      'almalinux10-64' => {
-                        general: {
-                          'platform' => 'el-10-x86_64',
-                        },
-                      },
-                      'almalinux10-AARCH64' => {
-                        general: {
-                          'platform' => 'el-10-aarch64',
-                        },
-                        abs: {
-                          'template' => 'almalinux-10-arm64',
-                        },
-                        vmpooler: {
-                          'template' => 'almalinux-10-arm64',
-                        },
-                      },
-                      'redhat9-POWER' => {
-                        general: {
-                          'platform' => 'el-9-ppc64le',
-                        },
-                        abs: {
-                          'template' => 'redhat-9-power9',
-                        },
-                      },
-                      'oracle9-AARCH64' => {
-                        general: {
-                          'platform' => 'el-9-aarch64',
-                        },
-                        abs: {
-                          'template' => 'oracle-9-arm64',
-                        },
-                        vmpooler: {
-                          'template' => 'oracle-9-arm64',
-                        },
-                      },
-                      'sles11-32' => {
-                        general: {
-                          'platform' => 'sles-11-i386',
-                        },
-                        vmpooler: {
-                          'template' => 'sles-11-i386',
-                        },
-                      },
-                      'sles11-64' => {
-                        general: {
-                          'platform' => 'sles-11-x86_64',
-                        },
-                        vmpooler: {
-                          'template' => 'sles-11-x86_64',
-                        },
-                      },
-                      'sles11-S390X' => {
-                        general: {
-                          'platform' => 'sles-11-s390x',
-                        },
-                      },
-                      'sles12-64' => {
-                        general: {
-                          'platform' => 'sles-12-x86_64',
-                        },
-                        vmpooler: {
-                          'template' => 'sles-12-x86_64',
-                        },
-                      },
-                      'sles12-S390X' => {
-                        general: {
-                          'platform' => 'sles-12-s390x',
-                        },
-                      },
-                      'sles12-POWER' => {
+                      'redhat7-POWER' => {
                         general: {
-                          'platform' => 'sles-12-ppc64le',
+                          'platform' => 'el-7-ppc64le',
                         },
                         abs: {
-                          'template' => 'sles-12-power8',
-                        },
-                      },
-                      'sles15-64' => {
-                        general: {
-                          'platform' => 'sles-15-x86_64',
-                        },
-                        vmpooler: {
-                          'template' => 'sles-15-x86_64',
+                          'template' => 'redhat-7.3-power8', # special case ?
                         },
                       },
                       'windows2008-64' => {
@@ -932,11 +720,45 @@ module BeakerHostGenerator
       # AIX
       yield %w[aix73-POWER aix-7.3-power]
+      # SLES
+      [11, 12, 15].each do |release|
+        yield ["sles#{release}-32", "sles-#{release}-i386"] if release == 11
+        yield ["sles#{release}-64", "sles-#{release}-x86_64"]
+        yield ["sles#{release}-S390X", "sles-#{release}-s390x"]
+        yield ["sles#{release}-POWER", "sles-#{release}-ppc64le"] if release >= 12
+      end
       # CentOS
       (7..10).each do |release|
         yield ["centos#{release}-64", "el-#{release}-x86_64"]
       end
+      # AlmaLinux
+      (8..10).each do |release|
+        yield ["almalinux#{release}-64", "el-#{release}-x86_64"]
+        yield ["almalinux#{release}-AARCH64", "el-#{release}-aarch64"] if release >= 9
+      end
+      # RedHat
+      (7..10).each do |release|
+        yield ["redhat#{release}-64", "el-#{release}-x86_64"]
+        yield ["redhat#{release}-AARCH64", "el-#{release}-aarch64"]
+        yield ["redhat#{release}-POWER", "el-#{release}-ppc64le"] if release <= 9
+        yield ["redhat#{release}-S390X", "el-#{release}-s390x"] if release == 7
+      end
+      # Rocky
+      (8..10).each do |release|
+        yield ["rocky#{release}-64", "el-#{release}-x86_64"]
+        yield ["rocky#{release}-AARCH64", "el-#{release}-aarch64"] if release >= 9
+      end
+      # Oracle
+      (7..10).each do |release|
+        yield ["oracle#{release}-64", "el-#{release}-x86_64"]
+        yield ["oracle#{release}-AARCH64", "el-#{release}-aarch64"] if release == 9
+      end
       # Debian
       (10..13).each do |release|
         yield ["debian#{release}-32", "debian-#{release}-i386"] if release < 11
@@ -987,10 +809,6 @@ module BeakerHostGenerator
       yield %w[amazonfips2023-64 amazonfips-2023-x86_64]
       # Azure Linux
       yield %w[azure3-64 azure-3-x86_64]
-      # Oracle / OracleLinux
-      (7..10).each do |release|
-        yield ["oracle#{release}-64", "el-#{release}-x86_64"]
-      end
       # Scientific Linux
       yield ['scientific7-64', 'el-7-x86_64']

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

@@ -24,7 +24,26 @@ module BeakerHostGenerator
         case node_info['ostype']
         when /^(almalinux|centos|oracle|redhat|rocky|scientific)/
-          base_config['template'] ||= base_config['platform']&.gsub(/^el/, ::Regexp.last_match(1))
+          os = Regexp.last_match(1)
+          arch = case node_info['bits']
+                 when '64'
+                   'x86_64'
+                 when 'AARCH64'
+                   'arm64'
+                 when 'POWER'
+                   "power#{node_info['ostype'].sub(os, '')}"
+                 end
+          base_config['template'] ||= "#{node_info['ostype'].sub(os, "#{os}-")}-#{arch}" if arch
+        when /^(sles)/
+          os = Regexp.last_match(1)
+          version = node_info['ostype'].sub(os, '')
+          arch = case node_info['bits']
+                 when 'POWER'
+                   'power8'
+                 end
+          base_config['template'] ||= "#{os}-#{version}-#{arch}" if arch
         when /^aix/, /^fedora/, /^opensuse/, /^panos/
           base_config['template'] ||= base_config['platform']
         when /^(debian|ubuntu|amazon(fips)?)/

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

@@ -19,7 +19,35 @@ module BeakerHostGenerator
         case node_info['ostype']
         when /^(almalinux|centos|oracle|redhat|rocky|scientific)/
-          base_config['template'] ||= base_config['platform']&.gsub(/^el/, ::Regexp.last_match(1))
+          os = Regexp.last_match(1)
+          arch = case node_info['bits']
+                 when '64'
+                   'x86_64'
+                 when 'AARCH64'
+                   case node_info['ostype'].sub(os, '')
+                   when '7', '8'
+                     'x86_64'
+                   else
+                     'arm64'
+                   end
+                 when 'POWER'
+                   'ppc64le'
+                 when 'S390X'
+                   's390x'
+                 end
+          base_config['template'] ||= "#{node_info['ostype'].sub(os, "#{os}-")}-#{arch}" if arch
+        when /^(sles)/
+          os = Regexp.last_match(1)
+          version = node_info['ostype'].sub(os, '')
+          arch = case node_info['bits']
+                 when '64'
+                   'x86_64'
+                 when '32'
+                   'i386'
+                 end
+          base_config['template'] ||= "#{os}-#{version}-#{arch}" if arch
         when /^fedora/, /^opensuse/, /^panos/
           base_config['template'] ||= base_config['platform']
         when /^(debian|ubuntu|vro)/

data/lib/beaker-hostgenerator/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '3.3.0'
+    STRING = '3.4.0'
   end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -36,16 +36,22 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.18'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.18'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -114,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
@@ -200,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Beaker Host Generator Utility
 test_files: []