beaker-hostgenerator 1.7.1 → 1.11.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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: fc36b44395bf6f0041c88b00d0cfe48aa7cf7228266d37fe62ef97d243363439
4
- data.tar.gz: c3c945d48d8014e840725d091cb5ec3dbee46f78eaf0ffceac663ccb396b9c86
3
+ metadata.gz: 67d2f85f798121ef64291a2efa7e2cd6c64382ba43bdf327a5465678105d52dc
4
+ data.tar.gz: 14c4e29e924b22eb16c06191b4e6cfc6aeb1d8a6626361200a992eaaea444245
5
5
  SHA512:
6
- metadata.gz: 4439bc945c20414a53ea46ca748f2409e3adaa4f5d839f5cbb15ba6059dd63cc3afb6c7610bf9b61af06680ca2405c9355fae4e91377df1c7bb66b739c35f1e8
7
- data.tar.gz: 37a7b8f9ab417ba43d4a4e1e5c6ab95f18effdff461740e68c343ad465533ec4d3a2dfa7bb0faeaaf856976df19181e1e500a682f1167d4edc90adb00fef3869
6
+ metadata.gz: a504a948dd4f3ea14c65c6de1ae0a0d04753fb9c0a0c69329b910170e5d2bbb31cb0285d0f5d27ae6a480a2ac7832923cda2aa8727141cc94fd44ade4030424f
7
+ data.tar.gz: ba570977c61cbb8040a1881c217fd05672f36ce249f8f1e494db903afffb1dd1fec0c0850f9b2672365ac835873d8bec8f8243fdb4f533c126c23fc3db3161ef
@@ -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
@@ -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,49 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file.
4
4
 
5
+ ## [1.11.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.11.0) (2022-01-27)
6
+
7
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.10.0...1.11.0)
8
+
9
+ **Implemented enhancements:**
10
+
11
+ - Use CentOS Stream 8 instead of CentOS Linux 8 [\#240](https://github.com/voxpupuli/beaker-hostgenerator/pull/240) ([ekohl](https://github.com/ekohl))
12
+ - Add CentOS 9 support [\#225](https://github.com/voxpupuli/beaker-hostgenerator/pull/225) ([ekohl](https://github.com/ekohl))
13
+
14
+ **Merged pull requests:**
15
+
16
+ - Drop redundant attributes from generated data [\#239](https://github.com/voxpupuli/beaker-hostgenerator/pull/239) ([ekohl](https://github.com/ekohl))
17
+
18
+ ## [1.10.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.10.0) (2021-12-10)
19
+
20
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.9.0...1.10.0)
21
+
22
+ **Implemented enhancements:**
23
+
24
+ - Add Arch Linux support [\#191](https://github.com/voxpupuli/beaker-hostgenerator/pull/191) ([ekohl](https://github.com/ekohl))
25
+
26
+ ## [1.9.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.9.0) (2021-12-08)
27
+
28
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.8.0...1.9.0)
29
+
30
+ **Implemented enhancements:**
31
+
32
+ - \(IMAGES-1323\) Adds RedHat 9 support [\#235](https://github.com/voxpupuli/beaker-hostgenerator/pull/235) ([mhashizume](https://github.com/mhashizume))
33
+
34
+ ## [1.8.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.8.0) (2021-10-25)
35
+
36
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.7.1...1.8.0)
37
+
38
+ **Implemented enhancements:**
39
+
40
+ - Implement coverage reports [\#233](https://github.com/voxpupuli/beaker-hostgenerator/pull/233) ([bastelfreak](https://github.com/bastelfreak))
41
+ - Align github actions/publish gem to github as well [\#232](https://github.com/voxpupuli/beaker-hostgenerator/pull/232) ([bastelfreak](https://github.com/bastelfreak))
42
+ - 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))
43
+
44
+ **Closed issues:**
45
+
46
+ - vmpooler API endpoint has changed [\#230](https://github.com/voxpupuli/beaker-hostgenerator/issues/230)
47
+
5
48
  ## [1.7.1](https://github.com/voxpupuli/beaker-hostgenerator/tree/1.7.1) (2021-09-22)
6
49
 
7
50
  [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/1.7.0...1.7.1)
data/Gemfile CHANGED
@@ -2,10 +2,15 @@ source ENV['GEM_SOURCE'] || 'https://rubygems.org'
2
2
 
3
3
  gemspec
4
4
 
5
- if File.exists? "#{__FILE__}.local"
5
+ if File.exist? "#{__FILE__}.local"
6
6
  eval(File.read("#{__FILE__}.local"), binding)
7
7
  end
8
8
 
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:
@@ -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
@@ -68,7 +68,7 @@ module BeakerHostGenerator
68
68
  'pe_ver' => options[:pe_ver] || pe_version,
69
69
  'pe_upgrade_dir' => options[:pe_upgrade_dir] || pe_dir(pe_upgrade_version),
70
70
  'pe_upgrade_ver' => options[:pe_upgrade_ver] || pe_upgrade_version,
71
- }
71
+ }.reject { |key, value| value.nil? }
72
72
  end
73
73
 
74
74
  # This is where all the information for all platforms lives, irrespective
@@ -152,8 +152,7 @@ module BeakerHostGenerator
152
152
  result.merge!({
153
153
  'aix53-POWER' => {
154
154
  :general => {
155
- 'platform' => 'aix-5.3-power',
156
- 'packaging_platform' => 'aix-5.3-power'
155
+ 'platform' => 'aix-5.3-power'
157
156
  },
158
157
  :abs => {
159
158
  'template' => 'aix-5.3-power'
@@ -161,8 +160,7 @@ module BeakerHostGenerator
161
160
  },
162
161
  'aix61-POWER' => {
163
162
  :general => {
164
- 'platform' => 'aix-6.1-power',
165
- 'packaging_platform' => 'aix-6.1-power'
163
+ 'platform' => 'aix-6.1-power'
166
164
  },
167
165
  :abs => {
168
166
  'template' => 'aix-6.1-power'
@@ -170,8 +168,7 @@ module BeakerHostGenerator
170
168
  },
171
169
  'aix71-POWER' => {
172
170
  :general => {
173
- 'platform' => 'aix-7.1-power',
174
- 'packaging_platform' => 'aix-7.1-power'
171
+ 'platform' => 'aix-7.1-power'
175
172
  },
176
173
  :abs => {
177
174
  'template' => 'aix-7.1-power'
@@ -199,8 +196,7 @@ module BeakerHostGenerator
199
196
  },
200
197
  'amazon6-64' => {
201
198
  :general => {
202
- 'platform' => 'el-6-x86_64',
203
- 'packaging_platform' => 'el-6-x86_64'
199
+ 'platform' => 'el-6-x86_64'
204
200
  },
205
201
  :abs => {
206
202
  'template' => 'amazon-6-x86_64'
@@ -208,8 +204,7 @@ module BeakerHostGenerator
208
204
  },
209
205
  'amazon7-64' => {
210
206
  :general => {
211
- 'platform' => 'el-7-x86_64',
212
- 'packaging_platform' => 'el-7-x86_64'
207
+ 'platform' => 'el-7-x86_64'
213
208
  },
214
209
  :abs => {
215
210
  'template' => 'amazon-7-x86_64'
@@ -217,17 +212,26 @@ module BeakerHostGenerator
217
212
  },
218
213
  'amazon7-ARM64' => {
219
214
  :general => {
220
- 'platform' => 'el-7-aarch64',
221
- 'packaging_platform' => 'el-7-aarch64'
215
+ 'platform' => 'el-7-aarch64'
222
216
  },
223
217
  :abs => {
224
218
  'template' => 'amazon-7-arm64'
225
219
  }
226
220
  },
221
+ 'archlinuxrolling-64' => {
222
+ :general => {
223
+ 'platform' => 'archlinux-rolling-x64',
224
+ },
225
+ :vagrant => {
226
+ 'box' => 'archlinux/archlinux',
227
+ },
228
+ :docker => {
229
+ 'image' => 'archlinux/archlinux',
230
+ }
231
+ },
227
232
  'arista4-32' => {
228
233
  :general => {
229
- 'platform' => 'eos-4-i386',
230
- 'packaging_platform' => 'eos-4-i386'
234
+ 'platform' => 'eos-4-i386'
231
235
  },
232
236
  :vmpooler => {
233
237
  'template' => 'arista-4-i386'
@@ -245,14 +249,12 @@ module BeakerHostGenerator
245
249
  },
246
250
  'centos5-32' => {
247
251
  :general => {
248
- 'platform' => 'el-5-i386',
249
- 'packaging_platform' => 'el-5-i386'
252
+ 'platform' => 'el-5-i386'
250
253
  }
251
254
  },
252
255
  'centos5-64' => {
253
256
  :general => {
254
- 'platform' => 'el-5-x86_64',
255
- 'packaging_platform' => 'el-5-x86_64'
257
+ 'platform' => 'el-5-x86_64'
256
258
  },
257
259
  :docker => {
258
260
  'docker_image_commands' => [
@@ -264,14 +266,12 @@ module BeakerHostGenerator
264
266
  },
265
267
  'centos6-32' => {
266
268
  :general => {
267
- 'platform' => 'el-6-i386',
268
- 'packaging_platform' => 'el-6-i386'
269
+ 'platform' => 'el-6-i386'
269
270
  }
270
271
  },
271
272
  'centos6-64' => {
272
273
  :general => {
273
- 'platform' => 'el-6-x86_64',
274
- 'packaging_platform' => 'el-6-x86_64'
274
+ 'platform' => 'el-6-x86_64'
275
275
  },
276
276
  :docker => {
277
277
  'docker_image_commands' => [
@@ -284,8 +284,7 @@ module BeakerHostGenerator
284
284
  },
285
285
  'centos7-64' => {
286
286
  :general => {
287
- 'platform' => 'el-7-x86_64',
288
- 'packaging_platform' => 'el-7-x86_64'
287
+ 'platform' => 'el-7-x86_64'
289
288
  },
290
289
  :docker => {
291
290
  'docker_image_commands' => [
@@ -296,16 +295,31 @@ module BeakerHostGenerator
296
295
  },
297
296
  'centos8-64' => {
298
297
  :general => {
299
- 'platform' => 'el-8-x86_64',
300
- 'packaging_platform' => 'el-8-x86_64'
298
+ 'platform' => 'el-8-x86_64'
299
+ },
300
+ :vagrant => {
301
+ 'box' => 'centos/stream8',
301
302
  },
302
303
  :docker => {
304
+ 'image' => 'quay.io/centos/centos:stream8',
303
305
  'docker_image_commands' => [
304
306
  'cp /bin/true /sbin/agetty',
305
307
  'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
306
308
  ]
307
309
  }
308
310
  },
311
+ 'centos9-64' => {
312
+ :general => {
313
+ 'platform' => 'el-9-x86_64'
314
+ },
315
+ :docker => {
316
+ 'image' => 'quay.io/centos/centos:stream9',
317
+ 'docker_image_commands' => [
318
+ 'cp /bin/true /sbin/agetty',
319
+ 'dnf install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
320
+ ]
321
+ }
322
+ },
309
323
  # Deprecated
310
324
  'cisconx-64' => {
311
325
  :general => {
@@ -524,8 +538,7 @@ module BeakerHostGenerator
524
538
  },
525
539
  'debian7-32' => {
526
540
  :general => {
527
- 'platform' => 'debian-7-i386',
528
- 'packaging_platform' => 'debian-7-i386'
541
+ 'platform' => 'debian-7-i386'
529
542
  },
530
543
  :vmpooler => {
531
544
  'template' => 'debian-7-i386'
@@ -533,8 +546,7 @@ module BeakerHostGenerator
533
546
  },
534
547
  'debian7-64' => {
535
548
  :general => {
536
- 'platform' => 'debian-7-amd64',
537
- 'packaging_platform' => 'debian-7-amd64'
549
+ 'platform' => 'debian-7-amd64'
538
550
  },
539
551
  :docker => {
540
552
  'docker_image_commands' => [
@@ -551,8 +563,7 @@ module BeakerHostGenerator
551
563
  },
552
564
  'debian8-32' => {
553
565
  :general => {
554
- 'platform' => 'debian-8-i386',
555
- 'packaging_platform' => 'debian-8-i386'
566
+ 'platform' => 'debian-8-i386'
556
567
  },
557
568
  :vmpooler => {
558
569
  'template' => 'debian-8-i386'
@@ -560,8 +571,7 @@ module BeakerHostGenerator
560
571
  },
561
572
  'debian8-64' => {
562
573
  :general => {
563
- 'platform' => 'debian-8-amd64',
564
- 'packaging_platform' => 'debian-8-amd64'
574
+ 'platform' => 'debian-8-amd64'
565
575
  },
566
576
  :docker => {
567
577
  'docker_image_commands' => [
@@ -579,8 +589,7 @@ module BeakerHostGenerator
579
589
  },
580
590
  'debian9-32' => {
581
591
  :general => {
582
- 'platform' => 'debian-9-i386',
583
- 'packaging_platform' => 'debian-9-i386'
592
+ 'platform' => 'debian-9-i386'
584
593
  },
585
594
  :vmpooler => {
586
595
  'template' => 'debian-9-i386'
@@ -595,8 +604,7 @@ module BeakerHostGenerator
595
604
  },
596
605
  'debian9-64' => {
597
606
  :general => {
598
- 'platform' => 'debian-9-amd64',
599
- 'packaging_platform' => 'debian-9-amd64'
607
+ 'platform' => 'debian-9-amd64'
600
608
  },
601
609
  :docker => {
602
610
  'docker_image_commands' => [
@@ -614,8 +622,7 @@ module BeakerHostGenerator
614
622
  },
615
623
  'debian10-64' => {
616
624
  :general => {
617
- 'platform' => 'debian-10-amd64',
618
- 'packaging_platform' => 'debian-10-amd64'
625
+ 'platform' => 'debian-10-amd64'
619
626
  },
620
627
  :docker => {
621
628
  'docker_image_commands' => [
@@ -633,8 +640,7 @@ module BeakerHostGenerator
633
640
  },
634
641
  'debian10-32' => {
635
642
  :general => {
636
- 'platform' => 'debian-10-i386',
637
- 'packaging_platform' => 'debian-10-i386'
643
+ 'platform' => 'debian-10-i386'
638
644
  },
639
645
  :docker => {
640
646
  'docker_image_commands' => [
@@ -649,8 +655,7 @@ module BeakerHostGenerator
649
655
  },
650
656
  'debian11-64' => {
651
657
  :general => {
652
- 'platform' => 'debian-11-amd64',
653
- 'packaging_platform' => 'debian-11-amd64'
658
+ 'platform' => 'debian-11-amd64'
654
659
  },
655
660
  :docker => {
656
661
  'docker_image_commands' => [
@@ -777,8 +782,7 @@ module BeakerHostGenerator
777
782
  },
778
783
  'oracle5-32' => {
779
784
  :general => {
780
- 'platform' => 'el-5-i386',
781
- 'packaging_platform' => 'el-5-i386'
785
+ 'platform' => 'el-5-i386'
782
786
  },
783
787
  :vmpooler => {
784
788
  'template' => 'oracle-5-i386'
@@ -786,8 +790,7 @@ module BeakerHostGenerator
786
790
  },
787
791
  'oracle5-64' => {
788
792
  :general => {
789
- 'platform' => 'el-5-x86_64',
790
- 'packaging_platform' => 'el-5-x86_64'
793
+ 'platform' => 'el-5-x86_64'
791
794
  },
792
795
  :vmpooler => {
793
796
  'template' => 'oracle-5-x86_64'
@@ -795,8 +798,7 @@ module BeakerHostGenerator
795
798
  },
796
799
  'oracle6-32' => {
797
800
  :general => {
798
- 'platform' => 'el-6-i386',
799
- 'packaging_platform' => 'el-6-i386'
801
+ 'platform' => 'el-6-i386'
800
802
  },
801
803
  :vmpooler => {
802
804
  'template' => 'oracle-6-i386'
@@ -804,8 +806,7 @@ module BeakerHostGenerator
804
806
  },
805
807
  'oracle6-64' => {
806
808
  :general => {
807
- 'platform' => 'el-6-x86_64',
808
- 'packaging_platform' => 'el-6-x86_64'
809
+ 'platform' => 'el-6-x86_64'
809
810
  },
810
811
  :vmpooler => {
811
812
  'template' => 'oracle-6-x86_64'
@@ -813,8 +814,7 @@ module BeakerHostGenerator
813
814
  },
814
815
  'oracle7-64' => {
815
816
  :general => {
816
- 'platform' => 'el-7-x86_64',
817
- 'packaging_platform' => 'el-7-x86_64'
817
+ 'platform' => 'el-7-x86_64'
818
818
  },
819
819
  :vmpooler => {
820
820
  'template' => 'oracle-7-x86_64'
@@ -830,8 +830,7 @@ module BeakerHostGenerator
830
830
  },
831
831
  'osx1010-64' => {
832
832
  :general => {
833
- 'platform' => 'osx-10.10-x86_64',
834
- 'packaging_platform' => 'osx-10.10-x86_64'
833
+ 'platform' => 'osx-10.10-x86_64'
835
834
  },
836
835
  :vmpooler => {
837
836
  'template' => 'osx-1010-x86_64'
@@ -839,8 +838,7 @@ module BeakerHostGenerator
839
838
  },
840
839
  'osx1011-64' => {
841
840
  :general => {
842
- 'platform' => 'osx-10.11-x86_64',
843
- 'packaging_platform' => 'osx-10.11-x86_64'
841
+ 'platform' => 'osx-10.11-x86_64'
844
842
  },
845
843
  :vmpooler => {
846
844
  'template' => 'osx-1011-x86_64'
@@ -848,8 +846,7 @@ module BeakerHostGenerator
848
846
  },
849
847
  'osx1012-64' => {
850
848
  :general => {
851
- 'platform' => 'osx-10.12-x86_64',
852
- 'packaging_platform' => 'osx-10.12-x86_64'
849
+ 'platform' => 'osx-10.12-x86_64'
853
850
  },
854
851
  :vmpooler => {
855
852
  'template' => 'osx-1012-x86_64'
@@ -857,8 +854,7 @@ module BeakerHostGenerator
857
854
  },
858
855
  'osx1013-64' => {
859
856
  :general => {
860
- 'platform' => 'osx-10.13-x86_64',
861
- 'packaging_platform' => 'osx-10.13-x86_64'
857
+ 'platform' => 'osx-10.13-x86_64'
862
858
  },
863
859
  :vmpooler => {
864
860
  'template' => 'osx-1013-x86_64'
@@ -866,8 +862,7 @@ module BeakerHostGenerator
866
862
  },
867
863
  'osx1014-64' => {
868
864
  :general => {
869
- 'platform' => 'osx-10.14-x86_64',
870
- 'packaging_platform' => 'osx-10.14-x86_64'
865
+ 'platform' => 'osx-10.14-x86_64'
871
866
  },
872
867
  :vmpooler => {
873
868
  'template' => 'osx-1014-x86_64'
@@ -875,8 +870,7 @@ module BeakerHostGenerator
875
870
  },
876
871
  'osx1015-64' => {
877
872
  :general => {
878
- 'platform' => 'osx-10.15-x86_64',
879
- 'packaging_platform' => 'osx-10.15-x86_64'
873
+ 'platform' => 'osx-10.15-x86_64'
880
874
  },
881
875
  :vmpooler => {
882
876
  'template' => 'osx-1015-x86_64'
@@ -884,8 +878,7 @@ module BeakerHostGenerator
884
878
  },
885
879
  'osx11-64' => {
886
880
  :general => {
887
- 'platform' => 'osx-11-x86_64',
888
- 'packaging_platform' => 'osx-11-x86_64'
881
+ 'platform' => 'osx-11-x86_64'
889
882
  },
890
883
  :vmpooler => {
891
884
  'template' => 'macos-112-x86_64'
@@ -909,8 +902,7 @@ module BeakerHostGenerator
909
902
  },
910
903
  'redhat5-32' => {
911
904
  :general => {
912
- 'platform' => 'el-5-i386',
913
- 'packaging_platform' => 'el-5-i386'
905
+ 'platform' => 'el-5-i386'
914
906
  },
915
907
  :vmpooler => {
916
908
  'template' => 'redhat-5-i386'
@@ -918,8 +910,7 @@ module BeakerHostGenerator
918
910
  },
919
911
  'redhat5-64' => {
920
912
  :general => {
921
- 'platform' => 'el-5-x86_64',
922
- 'packaging_platform' => 'el-5-x86_64'
913
+ 'platform' => 'el-5-x86_64'
923
914
  },
924
915
  :vmpooler => {
925
916
  'template' => 'redhat-5-x86_64'
@@ -927,8 +918,7 @@ module BeakerHostGenerator
927
918
  },
928
919
  'redhat6-32' => {
929
920
  :general => {
930
- 'platform' => 'el-6-i386',
931
- 'packaging_platform' => 'el-6-i386'
921
+ 'platform' => 'el-6-i386',
932
922
  },
933
923
  :vmpooler => {
934
924
  'template' => 'redhat-6-i386'
@@ -936,8 +926,7 @@ module BeakerHostGenerator
936
926
  },
937
927
  'redhat6-64' => {
938
928
  :general => {
939
- 'platform' => 'el-6-x86_64',
940
- 'packaging_platform' => 'el-6-x86_64'
929
+ 'platform' => 'el-6-x86_64'
941
930
  },
942
931
  :vmpooler => {
943
932
  'template' => 'redhat-6-x86_64'
@@ -945,14 +934,12 @@ module BeakerHostGenerator
945
934
  },
946
935
  'redhat6-S390X' => {
947
936
  :general => {
948
- 'platform' => 'el-6-s390x',
949
- 'packaging_platform' => 'el-6-s390x'
937
+ 'platform' => 'el-6-s390x'
950
938
  },
951
939
  },
952
940
  'redhat7-64' => {
953
941
  :general => {
954
- 'platform' => 'el-7-x86_64',
955
- 'packaging_platform' => 'el-7-x86_64'
942
+ 'platform' => 'el-7-x86_64'
956
943
  },
957
944
  :vmpooler => {
958
945
  'template' => 'redhat-7-x86_64'
@@ -969,8 +956,7 @@ module BeakerHostGenerator
969
956
  },
970
957
  'redhat7-POWER' => {
971
958
  :general => {
972
- 'platform' => 'el-7-ppc64le',
973
- 'packaging_platform' => 'el-7-ppc64le'
959
+ 'platform' => 'el-7-ppc64le',
974
960
  },
975
961
  :abs => {
976
962
  'template' => 'redhat-7.3-power8'
@@ -978,14 +964,12 @@ module BeakerHostGenerator
978
964
  },
979
965
  'redhat7-S390X' => {
980
966
  :general => {
981
- 'platform' => 'el-7-s390x',
982
- 'packaging_platform' => 'el-7-s390x'
967
+ 'platform' => 'el-7-s390x'
983
968
  },
984
969
  },
985
970
  'redhat7-AARCH64' => {
986
971
  :general => {
987
- 'platform' => 'el-7-aarch64',
988
- 'packaging_platform' => 'el-7-aarch64'
972
+ 'platform' => 'el-7-aarch64'
989
973
  },
990
974
  :abs => {
991
975
  'template' => 'centos-7-arm64'
@@ -996,8 +980,7 @@ module BeakerHostGenerator
996
980
  },
997
981
  'redhat8-64' => {
998
982
  :general => {
999
- 'platform' => 'el-8-x86_64',
1000
- 'packaging_platform' => 'el-8-x86_64'
983
+ 'platform' => 'el-8-x86_64'
1001
984
  },
1002
985
  :vmpooler => {
1003
986
  'template' => 'redhat-8-x86_64'
@@ -1014,8 +997,7 @@ module BeakerHostGenerator
1014
997
  },
1015
998
  'redhat8-AARCH64' => {
1016
999
  :general => {
1017
- 'platform' => 'el-8-aarch64',
1018
- 'packaging_platform' => 'el-8-aarch64'
1000
+ 'platform' => 'el-8-aarch64'
1019
1001
  },
1020
1002
  :abs => {
1021
1003
  'template' => 'redhat-8-arm64'
@@ -1026,13 +1008,20 @@ module BeakerHostGenerator
1026
1008
  },
1027
1009
  'redhat8-POWER' => {
1028
1010
  :general => {
1029
- 'platform' => 'el-8-ppc64le',
1030
- 'packaging_platform' => 'el-8-ppc64le'
1011
+ 'platform' => 'el-8-ppc64le'
1031
1012
  },
1032
1013
  :abs => {
1033
1014
  'template' => 'redhat-8-power8'
1034
1015
  }
1035
1016
  },
1017
+ 'redhat9-64' => {
1018
+ :general => {
1019
+ 'platform' => 'el-9-x86_64'
1020
+ },
1021
+ :vmpooler => {
1022
+ 'template' => 'redhat-9-x86_64'
1023
+ }
1024
+ },
1036
1025
  'rocky8-64' => {
1037
1026
  :general => {
1038
1027
  'platform' => 'el-8-x86_64',
@@ -1046,8 +1035,7 @@ module BeakerHostGenerator
1046
1035
  },
1047
1036
  'scientific5-32' => {
1048
1037
  :general => {
1049
- 'platform' => 'el-5-i386',
1050
- 'packaging_platform' => 'el-5-i386'
1038
+ 'platform' => 'el-5-i386'
1051
1039
  },
1052
1040
  :vmpooler => {
1053
1041
  'template' => 'scientific-5-i386'
@@ -1055,8 +1043,7 @@ module BeakerHostGenerator
1055
1043
  },
1056
1044
  'scientific5-64' => {
1057
1045
  :general => {
1058
- 'platform' => 'el-5-x86_64',
1059
- 'packaging_platform' => 'el-5-x86_64'
1046
+ 'platform' => 'el-5-x86_64'
1060
1047
  },
1061
1048
  :vmpooler => {
1062
1049
  'template' => 'scientific-5-x86_64'
@@ -1064,8 +1051,7 @@ module BeakerHostGenerator
1064
1051
  },
1065
1052
  'scientific6-32' => {
1066
1053
  :general => {
1067
- 'platform' => 'el-6-i386',
1068
- 'packaging_platform' => 'el-6-i386'
1054
+ 'platform' => 'el-6-i386'
1069
1055
  },
1070
1056
  :vmpooler => {
1071
1057
  'template' => 'scientific-6-i386'
@@ -1073,8 +1059,7 @@ module BeakerHostGenerator
1073
1059
  },
1074
1060
  'scientific6-64' => {
1075
1061
  :general => {
1076
- 'platform' => 'el-6-x86_64',
1077
- 'packaging_platform' => 'el-6-x86_64'
1062
+ 'platform' => 'el-6-x86_64'
1078
1063
  },
1079
1064
  :vmpooler => {
1080
1065
  'template' => 'scientific-6-x86_64'
@@ -1082,8 +1067,7 @@ module BeakerHostGenerator
1082
1067
  },
1083
1068
  'scientific7-64' => {
1084
1069
  :general => {
1085
- 'platform' => 'el-7-x86_64',
1086
- 'packaging_platform' => 'el-7-x86_64'
1070
+ 'platform' => 'el-7-x86_64'
1087
1071
  },
1088
1072
  :vmpooler => {
1089
1073
  'template' => 'scientific-7-x86_64'
@@ -1107,8 +1091,7 @@ module BeakerHostGenerator
1107
1091
  },
1108
1092
  'sles11-32' => {
1109
1093
  :general => {
1110
- 'platform' => 'sles-11-i386',
1111
- 'packaging_platform' => 'sles-11-i386'
1094
+ 'platform' => 'sles-11-i386'
1112
1095
  },
1113
1096
  :vmpooler => {
1114
1097
  'template' => 'sles-11-i386'
@@ -1116,8 +1099,7 @@ module BeakerHostGenerator
1116
1099
  },
1117
1100
  'sles11-64' => {
1118
1101
  :general => {
1119
- 'platform' => 'sles-11-x86_64',
1120
- 'packaging_platform' => 'sles-11-x86_64'
1102
+ 'platform' => 'sles-11-x86_64'
1121
1103
  },
1122
1104
  :vmpooler => {
1123
1105
  'template' => 'sles-11-x86_64'
@@ -1125,14 +1107,12 @@ module BeakerHostGenerator
1125
1107
  },
1126
1108
  'sles11-S390X' => {
1127
1109
  :general => {
1128
- 'platform' => 'sles-11-s390x',
1129
- 'packaging_platform' => 'sles-11-s390x'
1110
+ 'platform' => 'sles-11-s390x'
1130
1111
  },
1131
1112
  },
1132
1113
  'sles12-64' => {
1133
1114
  :general => {
1134
- 'platform' => 'sles-12-x86_64',
1135
- 'packaging_platform' => 'sles-12-x86_64'
1115
+ 'platform' => 'sles-12-x86_64'
1136
1116
  },
1137
1117
  :vmpooler => {
1138
1118
  'template' => 'sles-12-x86_64'
@@ -1140,14 +1120,12 @@ module BeakerHostGenerator
1140
1120
  },
1141
1121
  'sles12-S390X' => {
1142
1122
  :general => {
1143
- 'platform' => 'sles-12-s390x',
1144
- 'packaging_platform' => 'sles-12-s390x'
1123
+ 'platform' => 'sles-12-s390x'
1145
1124
  }
1146
1125
  },
1147
1126
  'sles12-POWER' => {
1148
1127
  :general => {
1149
- 'platform' => 'sles-12-ppc64le',
1150
- 'packaging_platform' => 'sles-12-ppc64le'
1128
+ 'platform' => 'sles-12-ppc64le'
1151
1129
  },
1152
1130
  :abs => {
1153
1131
  'template' => 'sles-12-power8'
@@ -1155,8 +1133,7 @@ module BeakerHostGenerator
1155
1133
  },
1156
1134
  'sles15-64' => {
1157
1135
  :general => {
1158
- 'platform' => 'sles-15-x86_64',
1159
- 'packaging_platform' => 'sles-15-x86_64'
1136
+ 'platform' => 'sles-15-x86_64'
1160
1137
  },
1161
1138
  :vmpooler => {
1162
1139
  'template' => 'sles-15-x86_64'
@@ -1164,8 +1141,7 @@ module BeakerHostGenerator
1164
1141
  },
1165
1142
  'solaris10-32' => {
1166
1143
  :general => {
1167
- 'platform' => 'solaris-10-i386',
1168
- 'packaging_platform' => 'solaris-10-i386'
1144
+ 'platform' => 'solaris-10-i386'
1169
1145
  },
1170
1146
  :vmpooler => {
1171
1147
  'template' => 'solaris-10-x86_64'
@@ -1173,8 +1149,7 @@ module BeakerHostGenerator
1173
1149
  },
1174
1150
  'solaris10-64' => {
1175
1151
  :general => {
1176
- 'platform' => 'solaris-10-i386',
1177
- 'packaging_platform' => 'solaris-10-i386'
1152
+ 'platform' => 'solaris-10-i386'
1178
1153
  },
1179
1154
  :vmpooler => {
1180
1155
  'template' => 'solaris-10-x86_64'
@@ -1182,8 +1157,7 @@ module BeakerHostGenerator
1182
1157
  },
1183
1158
  'solaris10-SPARC' => {
1184
1159
  :general => {
1185
- 'platform' => 'solaris-10-sparc',
1186
- 'packaging_platform' => 'solaris-10-sparc'
1160
+ 'platform' => 'solaris-10-sparc'
1187
1161
  },
1188
1162
  :abs => {
1189
1163
  'template' => 'solaris-10-sparc'
@@ -1191,8 +1165,7 @@ module BeakerHostGenerator
1191
1165
  },
1192
1166
  'solaris11-32' => {
1193
1167
  :general => {
1194
- 'platform' => 'solaris-11-i386',
1195
- 'packaging_platform' => 'solaris-11-i386'
1168
+ 'platform' => 'solaris-11-i386'
1196
1169
  },
1197
1170
  :vmpooler => {
1198
1171
  'template' => 'solaris-11-x86_64'
@@ -1200,8 +1173,7 @@ module BeakerHostGenerator
1200
1173
  },
1201
1174
  'solaris11-64' => {
1202
1175
  :general => {
1203
- 'platform' => 'solaris-11-i386',
1204
- 'packaging_platform' => 'solaris-11-i386'
1176
+ 'platform' => 'solaris-11-i386'
1205
1177
  },
1206
1178
  :vmpooler => {
1207
1179
  'template' => 'solaris-11-x86_64'
@@ -1209,8 +1181,7 @@ module BeakerHostGenerator
1209
1181
  },
1210
1182
  'solaris11-SPARC' => {
1211
1183
  :general => {
1212
- 'platform' => 'solaris-11-sparc',
1213
- 'packaging_platform' => 'solaris-11-sparc'
1184
+ 'platform' => 'solaris-11-sparc'
1214
1185
  },
1215
1186
  :abs => {
1216
1187
  'template' => 'solaris-11-sparc'
@@ -1254,8 +1225,7 @@ module BeakerHostGenerator
1254
1225
  },
1255
1226
  'vro6-64' => {
1256
1227
  :general => {
1257
- 'platform' => 'sles-11-x86_64',
1258
- 'packaging_platform' => 'sles-11-x86_64'
1228
+ 'platform' => 'sles-11-x86_64'
1259
1229
  },
1260
1230
  :vmpooler => {
1261
1231
  'template' => 'vro-6-x86_64'
@@ -1263,8 +1233,7 @@ module BeakerHostGenerator
1263
1233
  },
1264
1234
  'vro7-64' => {
1265
1235
  :general => {
1266
- 'platform' => 'sles-11-x86_64',
1267
- 'packaging_platform' => 'sles-11-x86_64'
1236
+ 'platform' => 'sles-11-x86_64'
1268
1237
  },
1269
1238
  :vmpooler => {
1270
1239
  'template' => 'vro-7-x86_64'
@@ -1272,8 +1241,7 @@ module BeakerHostGenerator
1272
1241
  },
1273
1242
  'vro71-64' => {
1274
1243
  :general => {
1275
- 'platform' => 'sles-11-x86_64',
1276
- 'packaging_platform' => 'sles-11-x86_64'
1244
+ 'platform' => 'sles-11-x86_64'
1277
1245
  },
1278
1246
  :vmpooler => {
1279
1247
  'template' => 'vro-71-x86_64'
@@ -1281,8 +1249,7 @@ module BeakerHostGenerator
1281
1249
  },
1282
1250
  'vro73-64' => {
1283
1251
  :general => {
1284
- 'platform' => 'sles-11-x86_64',
1285
- 'packaging_platform' => 'sles-11-x86_64'
1252
+ 'platform' => 'sles-11-x86_64'
1286
1253
  },
1287
1254
  :vmpooler => {
1288
1255
  'template' => 'vro-73-x86_64'
@@ -1290,8 +1257,7 @@ module BeakerHostGenerator
1290
1257
  },
1291
1258
  'vro74-64' => {
1292
1259
  :general => {
1293
- 'platform' => 'sles-11-x86_64',
1294
- 'packaging_platform' => 'sles-11-x86_64'
1260
+ 'platform' => 'sles-11-x86_64'
1295
1261
  },
1296
1262
  :vmpooler => {
1297
1263
  'template' => 'vro-74-x86_64'
@@ -1623,6 +1589,16 @@ module BeakerHostGenerator
1623
1589
  'template' => 'win-2019-core-x86_64'
1624
1590
  }
1625
1591
  },
1592
+ 'windows2022-64' => {
1593
+ :general => {
1594
+ 'platform' => 'windows-2022-64',
1595
+ 'packaging_platform' => 'windows-2012-x64',
1596
+ 'ruby_arch' => 'x64'
1597
+ },
1598
+ :vmpooler => {
1599
+ 'template' => 'win-2022-x86_64'
1600
+ }
1601
+ },
1626
1602
  'windows7-64' => {
1627
1603
  :general => {
1628
1604
  'platform' => 'windows-7-64',
@@ -1725,6 +1701,7 @@ module BeakerHostGenerator
1725
1701
  }
1726
1702
  })
1727
1703
 
1704
+ result['archlinux-64'] = result['archlinuxrolling-64']
1728
1705
  result
1729
1706
  end
1730
1707
 
@@ -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
 
@@ -1,5 +1,5 @@
1
1
  module BeakerHostGenerator
2
2
  module Version
3
- STRING = '1.7.1'
3
+ STRING = '1.11.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.1
4
+ version: 1.11.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: 2022-01-27 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