beaker-hostgenerator 1.7.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 132dc94d5189e4ca79255f915ed53ef895b607a82df75f01948ee1e3ae97d3d8
-  data.tar.gz: 75682b346b6d75f4a7bf457a0364919dc910698faa2ac7a318fdd1a2daae1824
+  metadata.gz: 97cadcf89d6cdfd3c54307a1ef316fd34e8dc54f8e1acdd7682bde775d352eff
+  data.tar.gz: 9ef354d62b1223c023d2f0e45d461a6206572bf7af2be11b4f6c07c26c2b4609
 SHA512:
-  metadata.gz: 3a3ee4782860c88a2f5717f5f0a1eb8e65686ca9c0e1b165cadb9154cc24234261a0a86477bfea4b548aae4db6e68e07a9832ef0ece0a88ebc57e5a3252e9854
-  data.tar.gz: 18b20b4d3b7f9bdc007b60afebdf2609e3bc2f9212b26953fb9fada146793d083e1ec602778c359d85381447f0ce18bdce4788a72097860c770db3d0917b2b10
+  metadata.gz: 9cd9e987519f3356ccb53ecb24fd54120e6157952bed7d1218b5e8dda7773d608046371eeafafadb16d98d15a682d624ce3f9ca1d9145878a798c43679219d34
+  data.tar.gz: 446ed14038fa3d651975d4e004e33057ccf5f83120914b57dbc5e3113618791725788b660aa3a73c6e277f3a34db9672f6dfda2903d980e3422d851e076f46e4

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,44 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.10.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.10.0) (2021-12-10)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.9.0...1.10.0)
+
+**Implemented enhancements:**
+
+- Add Arch Linux support [\#191](https://github.com/voxpupuli/beaker-hostgenerator/pull/191) ([ekohl](https://github.com/ekohl))
+
+## [1.9.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.9.0) (2021-12-08)
+
+[Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.8.0...1.9.0)
+
+**Implemented enhancements:**
+
+- \(IMAGES-1323\) Adds RedHat 9 support [\#235](https://github.com/voxpupuli/beaker-hostgenerator/pull/235) ([mhashizume](https://github.com/mhashizume))
+
+## [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)

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

data/lib/beaker-hostgenerator/data.rb

@@ -224,6 +224,17 @@ module BeakerHostGenerator
             'template' => 'amazon-7-arm64'
           }
         },
+        'archlinuxrolling-64' => {
+          :general => {
+            'platform' => 'archlinux-rolling-x64',
+          },
+          :vagrant => {
+            'box' => 'archlinux/archlinux',
+          },
+          :docker => {
+            'image' => 'archlinux/archlinux',
+          }
+        },
         'arista4-32' => {
           :general => {
             'platform'           => 'eos-4-i386',
@@ -1033,6 +1044,15 @@ module BeakerHostGenerator
             'template' => 'redhat-8-power8'
           }
         },
+        'redhat9-64' => {
+          :general => {
+            'platform'           => 'el-9-x86_64',
+            'packaging_platform' => 'el-9-x86_64'
+          },
+          :vmpooler => {
+            'template' => 'redhat-9-x86_64'
+          }
+        },
         'rocky8-64' => {
           :general => {
             'platform' => 'el-8-x86_64',
@@ -1623,6 +1643,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',
@@ -1725,6 +1755,7 @@ module BeakerHostGenerator
         }
       })
 
+      result['archlinux-64'] = result['archlinuxrolling-64']
       result
     end
 

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
 

data/lib/beaker-hostgenerator/version.rb

@@ -1,5 +1,5 @@
 module BeakerHostGenerator
   module Version
-    STRING = '1.7.0'
+    STRING = '1.10.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker-hostgenerator
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-22 00:00:00.000000000 Z
+date: 2021-12-10 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
@@ -222,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.32
 signing_key: 
 specification_version: 4
 summary: Beaker Host Generator Utility