beaker-hostgenerator 1.6.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3e4326354ac2f461c9d42ce6f2fbd7cc457b27653c054f1a0555d4d0efdff0f
-  data.tar.gz: 5931c224850c934fe091a3b473a2bf47a102b700f3fe06c77c39ab2062eca9cd
+  metadata.gz: 746b195dfba403d6dcd2bc2ced6206a0e3b9608e1ab5e7b9835bbbf5b92e0aac
+  data.tar.gz: 646bff8f600ba1a18409baea84a15d1986d49f372ac6febfe0895c7fe29c7d20
 SHA512:
-  metadata.gz: caf236c3caf1156f7062090dbb10a776350373bc4430612a509b4fa11a1ab662cc9e2cb3a36ccafdeae8ece1a292a465ad151d3241d091191fba370e36e3a4d3
-  data.tar.gz: 49b20acb26822cdfd7376c704c33f8581403d191419da42776f25a857190fb1454fa7dd6b42a0052fdfb97349bbcda61edc230a0e1818400343cee005baace12
+  metadata.gz: a0d5830714e4f422256f67536c31f12b779086156d867a8c2dd5ac13f911ae6361e222eab24192ede7fc10b6349467a8fb9467a31f3f7d2f400cb422ab0bf996
+  data.tar.gz: ac96953b0acdfa2d4f9f08edb0cc2fc82b80d39438ff34c36cba7682960519c59d72e1741f72c7a8ca03aa42b407f24bb2e57d21a59cb37477a0220141a0226d

data/.github/workflows/release.yml

@@ -1,22 +1,32 @@
 name: Release
 
 on:
-  create:
-    ref_type: tag
+  push:
+    tags:
+      - '*'
 
 jobs:
   release:
     runs-on: ubuntu-latest
-    if: github.repository == 'voxpupuli/beaker-hostgenerator'
+    if: github.repository_owner == 'voxpupuli'
     steps:
       - uses: actions/checkout@v2
-      - name: Install Ruby 2.7
+      - name: Install Ruby 3.0
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '2.7'
+          ruby-version: '3.0'
+        env:
+          BUNDLE_WITHOUT: release
       - name: Build gem
         run: gem build *.gemspec
-      - name: Publish gem
+      - name: Publish gem to rubygems.org
         run: gem push *.gem
         env:
           GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_AUTH_TOKEN }}'
+      - name: Setup GitHub packages access
+        run: |
+          mkdir -p ~/.gem
+          echo ":github: Bearer ${{ secrets.GITHUB_TOKEN }}" >> ~/.gem/credentials
+          chmod 0600 ~/.gem/credentials
+      - name: Publish gem to GitHub packages
+        run: gem push --key github --host https://rubygems.pkg.github.com/voxpupuli *.gem

data/.github/workflows/test.yml

@@ -4,18 +4,24 @@ on:
   - pull_request
   - push
 
+env:
+  BUNDLE_WITHOUT: release
+
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - "2.4"
-          - "2.5"
-          - "2.6"
-          - "2.7"
-    name: Ruby ${{ matrix.ruby }}
+        include:
+          - ruby: "2.4"
+          - ruby: "2.5"
+          - ruby: "2.6"
+          - ruby: "2.7"
+          - ruby: "3.0"
+            coverage: "yes"
+    env:
+      COVERAGE: ${{ matrix.coverage }}
     steps:
       - uses: actions/checkout@v2
       - name: Install Ruby ${{ matrix.ruby }}
@@ -24,4 +30,6 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Run tests
-        run: bundle exec rake test:spec
+        run: bundle exec rake
+      - name: Build gem
+        run: gem build *.gemspec

data/CHANGELOG.md

@@ -2,6 +2,46 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.8.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.8.0) (2021-10-25)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.7.1...1.8.0)
+
+**Implemented enhancements:**
+
+- Implement coverage reports [\#233](https://github.com/voxpupuli/beaker-hostgenerator/pull/233) ([bastelfreak](https://github.com/bastelfreak))
+- Align github actions/publish gem to github as well [\#232](https://github.com/voxpupuli/beaker-hostgenerator/pull/232) ([bastelfreak](https://github.com/bastelfreak))
+- Add Windows Server 2022 64-bit support and update default vmpooler API [\#231](https://github.com/voxpupuli/beaker-hostgenerator/pull/231) ([GabrielNagy](https://github.com/GabrielNagy))
+
+**Closed issues:**
+
+- vmpooler API endpoint has changed [\#230](https://github.com/voxpupuli/beaker-hostgenerator/issues/230)
+
+## [1.7.1](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.7.1) (2021-09-22)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.7.0...1.7.1)
+
+**Fixed bugs:**
+
+- Add ABS support for Rocky and Alma 8 [\#228](https://github.com/voxpupuli/beaker-hostgenerator/pull/228) ([GabrielNagy](https://github.com/GabrielNagy))
+
+## [1.7.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.7.0) (2021-09-22)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.6.1...1.7.0)
+
+**Implemented enhancements:**
+
+- \(IMAGES-1302\) Add Alma and Rocky 8 support [\#226](https://github.com/voxpupuli/beaker-hostgenerator/pull/226) ([GabrielNagy](https://github.com/GabrielNagy))
+- Add RedHat 8 FIPS platform definition [\#224](https://github.com/voxpupuli/beaker-hostgenerator/pull/224) ([GabrielNagy](https://github.com/GabrielNagy))
+- Remove stringify-hash as a dependency [\#219](https://github.com/voxpupuli/beaker-hostgenerator/pull/219) ([ekohl](https://github.com/ekohl))
+
+## [1.6.1](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.6.1) (2021-08-26)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.6.0...1.6.1)
+
+**Fixed bugs:**
+
+- Debian 11 docker: Install iproute2 [\#222](https://github.com/voxpupuli/beaker-hostgenerator/pull/222) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [1.6.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.6.0) (2021-08-17)
 
 [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.5.0...1.6.0)

data/Gemfile

@@ -9,3 +9,8 @@ end
 group :release do
   gem 'github_changelog_generator', :require => false
 end
+
+group :coverage, optional: ENV['COVERAGE']!='yes' do
+  gem 'simplecov-console', :require => false
+  gem 'codecov', :require => false
+end

data/README.md

@@ -1,5 +1,13 @@
 # Beaker Host Generator
 
+[![License](https://img.shields.io/github/license/voxpupuli/beaker-hostgenerator.svg)](https://github.com/voxpupuli/beaker-hostgenerator/blob/master/LICENSE)
+[![Test](https://github.com/voxpupuli/beaker-hostgenerator/actions/workflows/test.yml/badge.svg)](https://github.com/voxpupuli/beaker-hostgenerator/actions/workflows/test.yml)
+[![codecov](https://codecov.io/gh/voxpupuli/beaker-hostgenerator/branch/master/graph/badge.svg)](https://codecov.io/gh/voxpupuli/beaker-hostgenerator)
+[![Release](https://github.com/voxpupuli/beaker-hostgenerator/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/beaker-hostgenerator/actions/workflows/release.yml)
+[![RubyGem Version](https://img.shields.io/gem/v/beaker-hostgenerator.svg)](https://rubygems.org/gems/beaker-hostgenerator)
+[![RubyGem Downloads](https://img.shields.io/gem/dt/beaker-hostgenerator.svg)](https://rubygems.org/gems/beaker-hostgenerator)
+[![Donated by Puppet Inc](https://img.shields.io/badge/donated%20by-Puppet%20Inc-fb7047.svg)](#transfer-notice)
+
 `beaker-hostgenerator` is a command line utility designed to generate beaker
 host config files using a compact command line SUT specification.
 
@@ -453,6 +461,14 @@ contribute.
 If you have questions or comments, please contact the Beaker team at the
 `#puppet-dev` IRC channel on chat.freenode.org
 
+## Transfer Notice
+
+This plugin was originally authored by [Puppet Inc](http://puppet.com).
+The maintainer preferred that Vox Pupuli take ownership of the module for future improvement and maintenance.
+Existing pull requests and issues were transferred over, please fork and continue to contribute at https://github.com/voxpupuli/beaker-hostgenerator
+
+Previously: https://github.com/puppetlabs/beaker-hostgenerator
+
 ## Make a new release
 
 To make a new release:

data/beaker-hostgenerator.gemspec

@@ -25,7 +25,6 @@ eos
   s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'fakefs', '>= 0.6', '< 2.0'
   s.add_development_dependency 'rake', '~> 13.0'
-  s.add_development_dependency 'simplecov'
   s.add_development_dependency 'pry', '~> 0.10'
 
   # Documentation dependencies
@@ -34,7 +33,4 @@ eos
 
   # Run time dependencies
   s.add_runtime_dependency 'deep_merge', '~> 1.0'
-  s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
-
 end
-

data/lib/beaker-hostgenerator/data.rb

@@ -186,6 +186,17 @@ module BeakerHostGenerator
             'template' => 'aix-7.2-power'
           }
         },
+        'almalinux8-64' => {
+          :general => {
+            'platform' => 'el-8-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',
@@ -645,7 +656,7 @@ module BeakerHostGenerator
             'docker_image_commands' => [
               'cp /bin/true /sbin/agetty',
               'rm -f /usr/sbin/policy-rc.d',
-              'apt-get update && apt-get install -y cron locales-all net-tools wget gnupg'
+              'apt-get update && apt-get install -y cron locales-all net-tools wget gnupg iproute2'
             ]
           },
           :vagrant => {
@@ -992,6 +1003,15 @@ module BeakerHostGenerator
             'template' => 'redhat-8-x86_64'
           }
         },
+        'redhatfips8-64' => {
+          :general => {
+            'platform'           => 'el-8-x86_64',
+            'packaging_platform' => 'redhatfips-8-x86_64'
+          },
+          :vmpooler => {
+            'template' => 'redhat-fips-8-x86_64'
+          }
+        },
         'redhat8-AARCH64' => {
           :general => {
             'platform'           => 'el-8-aarch64',
@@ -1013,6 +1033,17 @@ module BeakerHostGenerator
             'template' => 'redhat-8-power8'
           }
         },
+        'rocky8-64' => {
+          :general => {
+            'platform' => 'el-8-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',
@@ -1592,6 +1623,16 @@ module BeakerHostGenerator
             'template' => 'win-2019-core-x86_64'
           }
         },
+        'windows2022-64' => {
+          :general => {
+            'platform'           => 'windows-2022-64',
+            'packaging_platform' => 'windows-2012-x64',
+            'ruby_arch' => 'x64'
+          },
+          :vmpooler => {
+            'template' => 'win-2022-x86_64'
+          }
+        },
         'windows7-64' => {
           :general => {
             'platform'           => 'windows-7-64',

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

@@ -23,10 +23,10 @@ module BeakerHostGenerator
         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 /^(almalinux|centos|redhat|rocky)/
+          base_config['template'] ||= base_config['platform'].gsub(/^el/, $1)
         when /^fedora/
-          base_config['template'] = base_config['platform']
+          base_config['template'] ||= base_config['platform']
         when /^ubuntu/
           base_template = node_info['ostype'].sub('ubuntu', 'ubuntu-')
           arch = case node_info['bits']
@@ -37,12 +37,12 @@ module BeakerHostGenerator
                  when 'AARCH64'
                    'arm64'
                  when 'POWER'
-                   base_template = node_info['ostype'].sub(/ubuntu(\d\d)/, 'ubuntu-\1.')
+                   base_template.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}"
+          base_config['template'] ||= "#{base_template}-#{arch}"
         end
 
         base_config

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

@@ -10,7 +10,7 @@ module BeakerHostGenerator
       # default global configuration keys
       def global_config
         {
-          'pooling_api' => 'http://vmpooler.delivery.puppetlabs.net/'
+          'pooling_api' => 'https://vmpooler-prod.k8s.infracore.puppet.net/'
         }
       end
 
@@ -18,10 +18,10 @@ module BeakerHostGenerator
         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 /^(almalinux|centos|redhat|rocky)/
+          base_config['template'] ||= base_config['platform'].gsub(/^el/, $1)
         when /^fedora/
-          base_config['template'] = base_config['platform']
+          base_config['template'] ||= base_config['platform']
         when /^ubuntu/
           arch = case node_info['bits']
                  when '64'
@@ -32,7 +32,7 @@ module BeakerHostGenerator
                    nil
                  end
 
-          base_config['template'] = "#{node_info['ostype'].sub('ubuntu', 'ubuntu-')}-#{arch}" if arch
+          base_config['template'] ||= "#{node_info['ostype'].sub('ubuntu', 'ubuntu-')}-#{arch}" if arch
         end
 
         # Some vmpooler/vsphere platforms have special requirements.

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '1.6.0'
+    STRING = '1.8.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-17 00:00:00.000000000 Z
+date: 2021-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -88,20 +88,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -158,20 +144,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: stringify-hash
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
 description: |
   The beaker-hostgenerator tool will take a Beaker SUT (System Under Test) spec as
   its first positional argument and use that to generate a Beaker host
@@ -236,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: Beaker Host Generator Utility