beaker-hostgenerator 1.7.0 → 1.10.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
  1. checksums.yaml +4 -4
  2. data/.github/workflows/release.yml +16 -6
  3. data/.github/workflows/test.yml +15 -7
  4. data/CHANGELOG.md +38 -0
  5. data/Gemfile +5 -0
  6. data/README.md +16 -0
  7. data/beaker-hostgenerator.gemspec +0 -1
  8. data/lib/beaker-hostgenerator/data.rb +31 -0
  9. data/lib/beaker-hostgenerator/hypervisor/abs.rb +5 -5
  10. data/lib/beaker-hostgenerator/hypervisor/vmpooler.rb +1 -1
  11. data/lib/beaker-hostgenerator/version.rb +1 -1
  12. metadata +3 -17
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 132dc94d5189e4ca79255f915ed53ef895b607a82df75f01948ee1e3ae97d3d8
4
- data.tar.gz: 75682b346b6d75f4a7bf457a0364919dc910698faa2ac7a318fdd1a2daae1824
3
+ metadata.gz: 97cadcf89d6cdfd3c54307a1ef316fd34e8dc54f8e1acdd7682bde775d352eff
4
+ data.tar.gz: 9ef354d62b1223c023d2f0e45d461a6206572bf7af2be11b4f6c07c26c2b4609
5
5
  SHA512:
6
- metadata.gz: 3a3ee4782860c88a2f5717f5f0a1eb8e65686ca9c0e1b165cadb9154cc24234261a0a86477bfea4b548aae4db6e68e07a9832ef0ece0a88ebc57e5a3252e9854
7
- data.tar.gz: 18b20b4d3b7f9bdc007b60afebdf2609e3bc2f9212b26953fb9fada146793d083e1ec602778c359d85381447f0ce18bdce4788a72097860c770db3d0917b2b10
6
+ metadata.gz: 9cd9e987519f3356ccb53ecb24fd54120e6157952bed7d1218b5e8dda7773d608046371eeafafadb16d98d15a682d624ce3f9ca1d9145878a798c43679219d34
7
+ data.tar.gz: 446ed14038fa3d651975d4e004e33057ccf5f83120914b57dbc5e3113618791725788b660aa3a73c6e277f3a34db9672f6dfda2903d980e3422d851e076f46e4
data/.github/workflows/release.yml CHANGED
@@ -1,22 +1,32 @@
1
1
  name: Release
2
2
 
3
3
  on:
4
- create:
5
- ref_type: tag
4
+ push:
5
+ tags:
6
+ - '*'
6
7
 
7
8
  jobs:
8
9
  release:
9
10
  runs-on: ubuntu-latest
10
- if: github.repository == 'voxpupuli/beaker-hostgenerator'
11
+ if: github.repository_owner == 'voxpupuli'
11
12
  steps:
12
13
  - uses: actions/checkout@v2
13
- - name: Install Ruby 2.7
14
+ - name: Install Ruby 3.0
14
15
  uses: ruby/setup-ruby@v1
15
16
  with:
16
- ruby-version: '2.7'
17
+ ruby-version: '3.0'
18
+ env:
19
+ BUNDLE_WITHOUT: release
17
20
  - name: Build gem
18
21
  run: gem build *.gemspec
19
- - name: Publish gem
22
+ - name: Publish gem to rubygems.org
20
23
  run: gem push *.gem
21
24
  env:
22
25
  GEM_HOST_API_KEY: '${{ secrets.RUBYGEMS_AUTH_TOKEN }}'
26
+ - name: Setup GitHub packages access
27
+ run: |
28
+ mkdir -p ~/.gem
29
+ echo ":github: Bearer ${{ secrets.GITHUB_TOKEN }}" >> ~/.gem/credentials
30
+ chmod 0600 ~/.gem/credentials
31
+ - name: Publish gem to GitHub packages
32
+ run: gem push --key github --host https://rubygems.pkg.github.com/voxpupuli *.gem
data/.github/workflows/test.yml CHANGED
@@ -4,18 +4,24 @@ on:
4
4
  - pull_request
5
5
  - push
6
6
 
7
+ env:
8
+ BUNDLE_WITHOUT: release
9
+
7
10
  jobs:
8
11
  test:
9
12
  runs-on: ubuntu-latest
10
13
  strategy:
11
14
  fail-fast: false
12
15
  matrix:
13
- ruby:
14
- - "2.4"
15
- - "2.5"
16
- - "2.6"
17
- - "2.7"
18
- name: Ruby ${{ matrix.ruby }}
16
+ include:
17
+ - ruby: "2.4"
18
+ - ruby: "2.5"
19
+ - ruby: "2.6"
20
+ - ruby: "2.7"
21
+ - ruby: "3.0"
22
+ coverage: "yes"
23
+ env:
24
+ COVERAGE: ${{ matrix.coverage }}
19
25
  steps:
20
26
  - uses: actions/checkout@v2
21
27
  - name: Install Ruby ${{ matrix.ruby }}
@@ -24,4 +30,6 @@ jobs:
24
30
  ruby-version: ${{ matrix.ruby }}
25
31
  bundler-cache: true
26
32
  - name: Run tests
27
- run: bundle exec rake test:spec
33
+ run: bundle exec rake
34
+ - name: Build gem
35
+ run: gem build *.gemspec
data/CHANGELOG.md CHANGED
@@ -2,6 +2,44 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file.
4
4
 
5
+ ## [1.10.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.10.0) (2021-12-10)
6
+
7
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.9.0...1.10.0)
8
+
9
+ **Implemented enhancements:**
10
+
11
+ - Add Arch Linux support [\#191](https://github.com/voxpupuli/beaker-hostgenerator/pull/191) ([ekohl](https://github.com/ekohl))
12
+
13
+ ## [1.9.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.9.0) (2021-12-08)
14
+
15
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.8.0...1.9.0)
16
+
17
+ **Implemented enhancements:**
18
+
19
+ - \(IMAGES-1323\) Adds RedHat 9 support [\#235](https://github.com/voxpupuli/beaker-hostgenerator/pull/235) ([mhashizume](https://github.com/mhashizume))
20
+
21
+ ## [1.8.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.8.0) (2021-10-25)
22
+
23
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.7.1...1.8.0)
24
+
25
+ **Implemented enhancements:**
26
+
27
+ - Implement coverage reports [\#233](https://github.com/voxpupuli/beaker-hostgenerator/pull/233) ([bastelfreak](https://github.com/bastelfreak))
28
+ - Align github actions/publish gem to github as well [\#232](https://github.com/voxpupuli/beaker-hostgenerator/pull/232) ([bastelfreak](https://github.com/bastelfreak))
29
+ - 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))
30
+
31
+ **Closed issues:**
32
+
33
+ - vmpooler API endpoint has changed [\#230](https://github.com/voxpupuli/beaker-hostgenerator/issues/230)
34
+
35
+ ## [1.7.1](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.7.1) (2021-09-22)
36
+
37
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.7.0...1.7.1)
38
+
39
+ **Fixed bugs:**
40
+
41
+ - Add ABS support for Rocky and Alma 8 [\#228](https://github.com/voxpupuli/beaker-hostgenerator/pull/228) ([GabrielNagy](https://github.com/GabrielNagy))
42
+
5
43
  ## [1.7.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.7.0) (2021-09-22)
6
44
 
7
45
  [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.6.1...1.7.0)
data/Gemfile CHANGED
@@ -9,3 +9,8 @@ end
9
9
  group :release do
10
10
  gem 'github_changelog_generator', :require => false
11
11
  end
12
+
13
+ group :coverage, optional: ENV['COVERAGE']!='yes' do
14
+ gem 'simplecov-console', :require => false
15
+ gem 'codecov', :require => false
16
+ end
data/README.md CHANGED
@@ -1,5 +1,13 @@
1
1
  # Beaker Host Generator
2
2
 
3
+ [![License](https://img.shields.io/github/license/voxpupuli/beaker-hostgenerator.svg)](https://github.com/voxpupuli/beaker-hostgenerator/blob/master/LICENSE)
4
+ [![Test](https://github.com/voxpupuli/beaker-hostgenerator/actions/workflows/test.yml/badge.svg)](https://github.com/voxpupuli/beaker-hostgenerator/actions/workflows/test.yml)
5
+ [![codecov](https://codecov.io/gh/voxpupuli/beaker-hostgenerator/branch/master/graph/badge.svg)](https://codecov.io/gh/voxpupuli/beaker-hostgenerator)
6
+ [![Release](https://github.com/voxpupuli/beaker-hostgenerator/actions/workflows/release.yml/badge.svg)](https://github.com/voxpupuli/beaker-hostgenerator/actions/workflows/release.yml)
7
+ [![RubyGem Version](https://img.shields.io/gem/v/beaker-hostgenerator.svg)](https://rubygems.org/gems/beaker-hostgenerator)
8
+ [![RubyGem Downloads](https://img.shields.io/gem/dt/beaker-hostgenerator.svg)](https://rubygems.org/gems/beaker-hostgenerator)
9
+ [![Donated by Puppet Inc](https://img.shields.io/badge/donated%20by-Puppet%20Inc-fb7047.svg)](#transfer-notice)
10
+
3
11
  `beaker-hostgenerator` is a command line utility designed to generate beaker
4
12
  host config files using a compact command line SUT specification.
5
13
 
@@ -453,6 +461,14 @@ contribute.
453
461
  If you have questions or comments, please contact the Beaker team at the
454
462
  `#puppet-dev` IRC channel on chat.freenode.org
455
463
 
464
+ ## Transfer Notice
465
+
466
+ This plugin was originally authored by [Puppet Inc](http://puppet.com).
467
+ The maintainer preferred that Vox Pupuli take ownership of the module for future improvement and maintenance.
468
+ Existing pull requests and issues were transferred over, please fork and continue to contribute at https://github.com/voxpupuli/beaker-hostgenerator
469
+
470
+ Previously: https://github.com/puppetlabs/beaker-hostgenerator
471
+
456
472
  ## Make a new release
457
473
 
458
474
  To make a new release:
data/beaker-hostgenerator.gemspec CHANGED
@@ -25,7 +25,6 @@ eos
25
25
  s.add_development_dependency 'rspec-its'
26
26
  s.add_development_dependency 'fakefs', '>= 0.6', '< 2.0'
27
27
  s.add_development_dependency 'rake', '~> 13.0'
28
- s.add_development_dependency 'simplecov'
29
28
  s.add_development_dependency 'pry', '~> 0.10'
30
29
 
31
30
  # Documentation dependencies
data/lib/beaker-hostgenerator/data.rb CHANGED
@@ -224,6 +224,17 @@ module BeakerHostGenerator
224
224
  'template' => 'amazon-7-arm64'
225
225
  }
226
226
  },
227
+ 'archlinuxrolling-64' => {
228
+ :general => {
229
+ 'platform' => 'archlinux-rolling-x64',
230
+ },
231
+ :vagrant => {
232
+ 'box' => 'archlinux/archlinux',
233
+ },
234
+ :docker => {
235
+ 'image' => 'archlinux/archlinux',
236
+ }
237
+ },
227
238
  'arista4-32' => {
228
239
  :general => {
229
240
  'platform' => 'eos-4-i386',
@@ -1033,6 +1044,15 @@ module BeakerHostGenerator
1033
1044
  'template' => 'redhat-8-power8'
1034
1045
  }
1035
1046
  },
1047
+ 'redhat9-64' => {
1048
+ :general => {
1049
+ 'platform' => 'el-9-x86_64',
1050
+ 'packaging_platform' => 'el-9-x86_64'
1051
+ },
1052
+ :vmpooler => {
1053
+ 'template' => 'redhat-9-x86_64'
1054
+ }
1055
+ },
1036
1056
  'rocky8-64' => {
1037
1057
  :general => {
1038
1058
  'platform' => 'el-8-x86_64',
@@ -1623,6 +1643,16 @@ module BeakerHostGenerator
1623
1643
  'template' => 'win-2019-core-x86_64'
1624
1644
  }
1625
1645
  },
1646
+ 'windows2022-64' => {
1647
+ :general => {
1648
+ 'platform' => 'windows-2022-64',
1649
+ 'packaging_platform' => 'windows-2012-x64',
1650
+ 'ruby_arch' => 'x64'
1651
+ },
1652
+ :vmpooler => {
1653
+ 'template' => 'win-2022-x86_64'
1654
+ }
1655
+ },
1626
1656
  'windows7-64' => {
1627
1657
  :general => {
1628
1658
  'platform' => 'windows-7-64',
@@ -1725,6 +1755,7 @@ module BeakerHostGenerator
1725
1755
  }
1726
1756
  })
1727
1757
 
1758
+ result['archlinux-64'] = result['archlinuxrolling-64']
1728
1759
  result
1729
1760
  end
1730
1761
 
data/lib/beaker-hostgenerator/hypervisor/abs.rb CHANGED
@@ -23,10 +23,10 @@ module BeakerHostGenerator
23
23
  base_config = base_generate_node(node_info, base_config, bhg_version, :vmpooler, :abs)
24
24
 
25
25
  case node_info['ostype']
26
- when /^centos/
27
- base_config['template'] = base_config['platform'].gsub(/^el/, 'centos')
26
+ when /^(almalinux|centos|redhat|rocky)/
27
+ base_config['template'] ||= base_config['platform'].gsub(/^el/, $1)
28
28
  when /^fedora/
29
- base_config['template'] = base_config['platform']
29
+ base_config['template'] ||= base_config['platform']
30
30
  when /^ubuntu/
31
31
  base_template = node_info['ostype'].sub('ubuntu', 'ubuntu-')
32
32
  arch = case node_info['bits']
@@ -37,12 +37,12 @@ module BeakerHostGenerator
37
37
  when 'AARCH64'
38
38
  'arm64'
39
39
  when 'POWER'
40
- base_template = node_info['ostype'].sub(/ubuntu(\d\d)/, 'ubuntu-\1.')
40
+ base_template.sub!(/ubuntu-(\d\d)/, 'ubuntu-\1.')
41
41
  'power8'
42
42
  else
43
43
  raise "Unknown bits '#{node_info['bits']}' for '#{node_info['ostype']}'"
44
44
  end
45
- base_config['template'] = "#{base_template}-#{arch}"
45
+ base_config['template'] ||= "#{base_template}-#{arch}"
46
46
  end
47
47
 
48
48
  base_config
data/lib/beaker-hostgenerator/hypervisor/vmpooler.rb CHANGED
@@ -10,7 +10,7 @@ module BeakerHostGenerator
10
10
  # default global configuration keys
11
11
  def global_config
12
12
  {
13
- 'pooling_api' => 'http://vmpooler.delivery.puppetlabs.net/'
13
+ 'pooling_api' => 'https://vmpooler-prod.k8s.infracore.puppet.net/'
14
14
  }
15
15
  end
16
16
 
data/lib/beaker-hostgenerator/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module BeakerHostGenerator
2
2
  module Version
3
- STRING = '1.7.0'
3
+ STRING = '1.10.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: beaker-hostgenerator
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.7.0
4
+ version: 1.10.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Branan Purvine-Riley
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2021-09-22 00:00:00.000000000 Z
13
+ date: 2021-12-10 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: minitest
@@ -88,20 +88,6 @@ dependencies:
88
88
  - - "~>"
89
89
  - !ruby/object:Gem::Version
90
90
  version: '13.0'
91
- - !ruby/object:Gem::Dependency
92
- name: simplecov
93
- requirement: !ruby/object:Gem::Requirement
94
- requirements:
95
- - - ">="
96
- - !ruby/object:Gem::Version
97
- version: '0'
98
- type: :development
99
- prerelease: false
100
- version_requirements: !ruby/object:Gem::Requirement
101
- requirements:
102
- - - ">="
103
- - !ruby/object:Gem::Version
104
- version: '0'
105
91
  - !ruby/object:Gem::Dependency
106
92
  name: pry
107
93
  requirement: !ruby/object:Gem::Requirement
@@ -222,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
222
208
  - !ruby/object:Gem::Version
223
209
  version: '0'
224
210
  requirements: []
225
- rubygems_version: 3.1.6
211
+ rubygems_version: 3.2.32
226
212
  signing_key:
227
213
  specification_version: 4
228
214
  summary: Beaker Host Generator Utility