beaker-hostgenerator 1.6.0 → 1.8.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 +40 -0
  5. data/Gemfile +5 -0
  6. data/README.md +16 -0
  7. data/beaker-hostgenerator.gemspec +0 -4
  8. data/lib/beaker-hostgenerator/data.rb +42 -1
  9. data/lib/beaker-hostgenerator/hypervisor/abs.rb +5 -5
  10. data/lib/beaker-hostgenerator/hypervisor/vmpooler.rb +5 -5
  11. data/lib/beaker-hostgenerator/version.rb +1 -1
  12. metadata +3 -31
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f3e4326354ac2f461c9d42ce6f2fbd7cc457b27653c054f1a0555d4d0efdff0f
4
- data.tar.gz: 5931c224850c934fe091a3b473a2bf47a102b700f3fe06c77c39ab2062eca9cd
3
+ metadata.gz: 746b195dfba403d6dcd2bc2ced6206a0e3b9608e1ab5e7b9835bbbf5b92e0aac
4
+ data.tar.gz: 646bff8f600ba1a18409baea84a15d1986d49f372ac6febfe0895c7fe29c7d20
5
5
  SHA512:
6
- metadata.gz: caf236c3caf1156f7062090dbb10a776350373bc4430612a509b4fa11a1ab662cc9e2cb3a36ccafdeae8ece1a292a465ad151d3241d091191fba370e36e3a4d3
7
- data.tar.gz: 49b20acb26822cdfd7376c704c33f8581403d191419da42776f25a857190fb1454fa7dd6b42a0052fdfb97349bbcda61edc230a0e1818400343cee005baace12
6
+ metadata.gz: a0d5830714e4f422256f67536c31f12b779086156d867a8c2dd5ac13f911ae6361e222eab24192ede7fc10b6349467a8fb9467a31f3f7d2f400cb422ab0bf996
7
+ data.tar.gz: ac96953b0acdfa2d4f9f08edb0cc2fc82b80d39438ff34c36cba7682960519c59d72e1741f72c7a8ca03aa42b407f24bb2e57d21a59cb37477a0220141a0226d
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,46 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file.
4
4
 
5
+ ## [1.8.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.8.0) (2021-10-25)
6
+
7
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.7.1...1.8.0)
8
+
9
+ **Implemented enhancements:**
10
+
11
+ - Implement coverage reports [\#233](https://github.com/voxpupuli/beaker-hostgenerator/pull/233) ([bastelfreak](https://github.com/bastelfreak))
12
+ - Align github actions/publish gem to github as well [\#232](https://github.com/voxpupuli/beaker-hostgenerator/pull/232) ([bastelfreak](https://github.com/bastelfreak))
13
+ - 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))
14
+
15
+ **Closed issues:**
16
+
17
+ - vmpooler API endpoint has changed [\#230](https://github.com/voxpupuli/beaker-hostgenerator/issues/230)
18
+
19
+ ## [1.7.1](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.7.1) (2021-09-22)
20
+
21
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.7.0...1.7.1)
22
+
23
+ **Fixed bugs:**
24
+
25
+ - Add ABS support for Rocky and Alma 8 [\#228](https://github.com/voxpupuli/beaker-hostgenerator/pull/228) ([GabrielNagy](https://github.com/GabrielNagy))
26
+
27
+ ## [1.7.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.7.0) (2021-09-22)
28
+
29
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.6.1...1.7.0)
30
+
31
+ **Implemented enhancements:**
32
+
33
+ - \(IMAGES-1302\) Add Alma and Rocky 8 support [\#226](https://github.com/voxpupuli/beaker-hostgenerator/pull/226) ([GabrielNagy](https://github.com/GabrielNagy))
34
+ - Add RedHat 8 FIPS platform definition [\#224](https://github.com/voxpupuli/beaker-hostgenerator/pull/224) ([GabrielNagy](https://github.com/GabrielNagy))
35
+ - Remove stringify-hash as a dependency [\#219](https://github.com/voxpupuli/beaker-hostgenerator/pull/219) ([ekohl](https://github.com/ekohl))
36
+
37
+ ## [1.6.1](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.6.1) (2021-08-26)
38
+
39
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.6.0...1.6.1)
40
+
41
+ **Fixed bugs:**
42
+
43
+ - Debian 11 docker: Install iproute2 [\#222](https://github.com/voxpupuli/beaker-hostgenerator/pull/222) ([bastelfreak](https://github.com/bastelfreak))
44
+
5
45
  ## [1.6.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.6.0) (2021-08-17)
6
46
 
7
47
  [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.5.0...1.6.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
@@ -34,7 +33,4 @@ eos
34
33
 
35
34
  # Run time dependencies
36
35
  s.add_runtime_dependency 'deep_merge', '~> 1.0'
37
- s.add_runtime_dependency 'stringify-hash', '~> 0.0.0'
38
-
39
36
  end
40
-
data/lib/beaker-hostgenerator/data.rb CHANGED
@@ -186,6 +186,17 @@ module BeakerHostGenerator
186
186
  'template' => 'aix-7.2-power'
187
187
  }
188
188
  },
189
+ 'almalinux8-64' => {
190
+ :general => {
191
+ 'platform' => 'el-8-x86_64',
192
+ },
193
+ :docker => {
194
+ 'docker_image_commands' => [
195
+ 'cp /bin/true /sbin/agetty',
196
+ 'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
197
+ ]
198
+ }
199
+ },
189
200
  'amazon6-64' => {
190
201
  :general => {
191
202
  'platform' => 'el-6-x86_64',
@@ -645,7 +656,7 @@ module BeakerHostGenerator
645
656
  'docker_image_commands' => [
646
657
  'cp /bin/true /sbin/agetty',
647
658
  'rm -f /usr/sbin/policy-rc.d',
648
- 'apt-get update && apt-get install -y cron locales-all net-tools wget gnupg'
659
+ 'apt-get update && apt-get install -y cron locales-all net-tools wget gnupg iproute2'
649
660
  ]
650
661
  },
651
662
  :vagrant => {
@@ -992,6 +1003,15 @@ module BeakerHostGenerator
992
1003
  'template' => 'redhat-8-x86_64'
993
1004
  }
994
1005
  },
1006
+ 'redhatfips8-64' => {
1007
+ :general => {
1008
+ 'platform' => 'el-8-x86_64',
1009
+ 'packaging_platform' => 'redhatfips-8-x86_64'
1010
+ },
1011
+ :vmpooler => {
1012
+ 'template' => 'redhat-fips-8-x86_64'
1013
+ }
1014
+ },
995
1015
  'redhat8-AARCH64' => {
996
1016
  :general => {
997
1017
  'platform' => 'el-8-aarch64',
@@ -1013,6 +1033,17 @@ module BeakerHostGenerator
1013
1033
  'template' => 'redhat-8-power8'
1014
1034
  }
1015
1035
  },
1036
+ 'rocky8-64' => {
1037
+ :general => {
1038
+ 'platform' => 'el-8-x86_64',
1039
+ },
1040
+ :docker => {
1041
+ 'docker_image_commands' => [
1042
+ 'cp /bin/true /sbin/agetty',
1043
+ 'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
1044
+ ]
1045
+ }
1046
+ },
1016
1047
  'scientific5-32' => {
1017
1048
  :general => {
1018
1049
  'platform' => 'el-5-i386',
@@ -1592,6 +1623,16 @@ module BeakerHostGenerator
1592
1623
  'template' => 'win-2019-core-x86_64'
1593
1624
  }
1594
1625
  },
1626
+ 'windows2022-64' => {
1627
+ :general => {
1628
+ 'platform' => 'windows-2022-64',
1629
+ 'packaging_platform' => 'windows-2012-x64',
1630
+ 'ruby_arch' => 'x64'
1631
+ },
1632
+ :vmpooler => {
1633
+ 'template' => 'win-2022-x86_64'
1634
+ }
1635
+ },
1595
1636
  'windows7-64' => {
1596
1637
  :general => {
1597
1638
  'platform' => 'windows-7-64',
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
 
@@ -18,10 +18,10 @@ module BeakerHostGenerator
18
18
  base_config = base_generate_node(node_info, base_config, bhg_version, :vmpooler)
19
19
 
20
20
  case node_info['ostype']
21
- when /^centos/
22
- base_config['template'] = base_config['platform'].gsub(/^el/, 'centos')
21
+ when /^(almalinux|centos|redhat|rocky)/
22
+ base_config['template'] ||= base_config['platform'].gsub(/^el/, $1)
23
23
  when /^fedora/
24
- base_config['template'] = base_config['platform']
24
+ base_config['template'] ||= base_config['platform']
25
25
  when /^ubuntu/
26
26
  arch = case node_info['bits']
27
27
  when '64'
@@ -32,7 +32,7 @@ module BeakerHostGenerator
32
32
  nil
33
33
  end
34
34
 
35
- base_config['template'] = "#{node_info['ostype'].sub('ubuntu', 'ubuntu-')}-#{arch}" if arch
35
+ base_config['template'] ||= "#{node_info['ostype'].sub('ubuntu', 'ubuntu-')}-#{arch}" if arch
36
36
  end
37
37
 
38
38
  # Some vmpooler/vsphere platforms have special requirements.
data/lib/beaker-hostgenerator/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module BeakerHostGenerator
2
2
  module Version
3
- STRING = '1.6.0'
3
+ STRING = '1.8.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.6.0
4
+ version: 1.8.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-08-17 00:00:00.000000000 Z
13
+ date: 2021-10-25 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
@@ -158,20 +144,6 @@ dependencies:
158
144
  - - "~>"
159
145
  - !ruby/object:Gem::Version
160
146
  version: '1.0'
161
- - !ruby/object:Gem::Dependency
162
- name: stringify-hash
163
- requirement: !ruby/object:Gem::Requirement
164
- requirements:
165
- - - "~>"
166
- - !ruby/object:Gem::Version
167
- version: 0.0.0
168
- type: :runtime
169
- prerelease: false
170
- version_requirements: !ruby/object:Gem::Requirement
171
- requirements:
172
- - - "~>"
173
- - !ruby/object:Gem::Version
174
- version: 0.0.0
175
147
  description: |
176
148
  The beaker-hostgenerator tool will take a Beaker SUT (System Under Test) spec as
177
149
  its first positional argument and use that to generate a Beaker host
@@ -236,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
236
208
  - !ruby/object:Gem::Version
237
209
  version: '0'
238
210
  requirements: []
239
- rubygems_version: 3.1.6
211
+ rubygems_version: 3.2.22
240
212
  signing_key:
241
213
  specification_version: 4
242
214
  summary: Beaker Host Generator Utility