beaker-hostgenerator 3.0.0 → 3.2.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 (13) hide show
  1. checksums.yaml +4 -4
  2. data/.github/release.yml +41 -0
  3. data/.github/workflows/release.yml +5 -5
  4. data/.github/workflows/test.yml +4 -4
  5. data/CHANGELOG.md +17 -0
  6. data/Gemfile +1 -1
  7. data/beaker-hostgenerator.gemspec +1 -1
  8. data/lib/beaker-hostgenerator/data.rb +75 -271
  9. data/lib/beaker-hostgenerator/hypervisor/abs.rb +5 -0
  10. data/lib/beaker-hostgenerator/hypervisor/vagrant.rb +25 -1
  11. data/lib/beaker-hostgenerator/hypervisor/vmpooler.rb +23 -1
  12. data/lib/beaker-hostgenerator/version.rb +1 -1
  13. metadata +4 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: f276dad6906ee76b4cc7cffb911691a5d94232510dc6da471d62ddb7382a3ab9
4
- data.tar.gz: 83e51abc94ec84aebb7c190772c8519418256497f36998b12824f437fd599433
3
+ metadata.gz: 8eab72d71ce2ed56cf8641c01b7d2208dff64190935581a461d7e6b19c483b2a
4
+ data.tar.gz: fd7bbbc4ac821298b679c1728b57a3b075eda6c5cfcffa5b86effe0a13494387
5
5
  SHA512:
6
- metadata.gz: daf745a1e9df53f70541309a87d2f671b6454f7772292bec38333a3d93353f74e981f81a005ff16ff469b9892e4bcf5560b94f58e65020400208f209a6b7ddad
7
- data.tar.gz: 10ec395ae998aaa58807432142e788d69a39e99b82459c2f1995ede532888044b280517ef416c108414eac8a02c6d5a7dad2d3011c5d8fed7fe34a271296f728
6
+ metadata.gz: 6927f4be6aca076dc222bb8f970f0a1c8f6af60cccad22f6aafd389a77fbd7ce46d25ed385b8f438c93f23d0938886bebdec98e3b00c18cba2c96ca3de09fe8f
7
+ data.tar.gz: 2307097f7bd48edce925a4ed8b3e3d3c6487019dd70322f1ec61361c4bf89e38156f8dbefd46e8359849410115dd5f1880e75eb8c441ae46ba7b5f55024c53ea
data/.github/release.yml ADDED
@@ -0,0 +1,41 @@
1
+ ---
2
+ # https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
3
+
4
+ changelog:
5
+ exclude:
6
+ labels:
7
+ - duplicate
8
+ - invalid
9
+ - modulesync
10
+ - question
11
+ - skip-changelog
12
+ - wont-fix
13
+ - wontfix
14
+ - github_actions
15
+
16
+ categories:
17
+ - title: Breaking Changes 🛠
18
+ labels:
19
+ - backwards-incompatible
20
+
21
+ - title: New Features 🎉
22
+ labels:
23
+ - enhancement
24
+
25
+ - title: Bug Fixes 🐛
26
+ labels:
27
+ - bug
28
+ - bugfix
29
+
30
+ - title: Documentation Updates 📚
31
+ labels:
32
+ - documentation
33
+ - docs
34
+
35
+ - title: Dependency Updates ⬆️
36
+ labels:
37
+ - dependencies
38
+
39
+ - title: Other Changes
40
+ labels:
41
+ - "*"
data/.github/workflows/release.yml CHANGED
@@ -15,7 +15,7 @@ jobs:
15
15
  name: Build the gem
16
16
  runs-on: ubuntu-24.04
17
17
  steps:
18
- - uses: actions/checkout@v4
18
+ - uses: actions/checkout@v5
19
19
  - name: Install Ruby
20
20
  uses: ruby/setup-ruby@v1
21
21
  with:
@@ -39,7 +39,7 @@ jobs:
39
39
  contents: write # clone repo and create release
40
40
  steps:
41
41
  - name: Download gem from GitHub cache
42
- uses: actions/download-artifact@v4
42
+ uses: actions/download-artifact@v5
43
43
  with:
44
44
  name: gem-artifact
45
45
  - name: Create Release
@@ -56,7 +56,7 @@ jobs:
56
56
  packages: write # publish to rubygems.pkg.github.com
57
57
  steps:
58
58
  - name: Download gem from GitHub cache
59
- uses: actions/download-artifact@v4
59
+ uses: actions/download-artifact@v5
60
60
  with:
61
61
  name: gem-artifact
62
62
  - name: Publish gem to GitHub packages
@@ -73,7 +73,7 @@ jobs:
73
73
  id-token: write # rubygems.org authentication
74
74
  steps:
75
75
  - name: Download gem from GitHub cache
76
- uses: actions/download-artifact@v4
76
+ uses: actions/download-artifact@v5
77
77
  with:
78
78
  name: gem-artifact
79
79
  - uses: rubygems/configure-rubygems-credentials@v1.0.0
@@ -92,7 +92,7 @@ jobs:
92
92
  - release-to-rubygems
93
93
  steps:
94
94
  - name: Download gem from GitHub cache
95
- uses: actions/download-artifact@v4
95
+ uses: actions/download-artifact@v5
96
96
  with:
97
97
  name: gem-artifact
98
98
  - name: Install Ruby
data/.github/workflows/test.yml CHANGED
@@ -6,8 +6,8 @@ on:
6
6
  branches:
7
7
  - master
8
8
 
9
- env:
10
- BUNDLE_WITHOUT: release
9
+ permissions:
10
+ contents: read
11
11
 
12
12
  jobs:
13
13
  rubocop_and_matrix:
@@ -15,7 +15,7 @@ jobs:
15
15
  outputs:
16
16
  ruby: ${{ steps.ruby.outputs.versions }}
17
17
  steps:
18
- - uses: actions/checkout@v4
18
+ - uses: actions/checkout@v5
19
19
  - name: Install Ruby 3.4
20
20
  uses: ruby/setup-ruby@v1
21
21
  with:
@@ -35,7 +35,7 @@ jobs:
35
35
  matrix:
36
36
  ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
37
37
  steps:
38
- - uses: actions/checkout@v4
38
+ - uses: actions/checkout@v5
39
39
  - name: Setup ruby
40
40
  uses: ruby/setup-ruby@v1
41
41
  with:
data/CHANGELOG.md CHANGED
@@ -2,6 +2,23 @@
2
2
 
3
3
  All notable changes to this project will be documented in this file.
4
4
 
5
+ ## [3.2.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/3.2.0) (2025-08-15)
6
+
7
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/3.1.0...3.2.0)
8
+
9
+ **Implemented enhancements:**
10
+
11
+ - Add data for Almalinux and Rocky 10 [\#426](https://github.com/voxpupuli/beaker-hostgenerator/pull/426) ([traylenator](https://github.com/traylenator))
12
+ - Generate OS X, MacOS, Palo Alto OS, Solaris & VRO in loops [\#425](https://github.com/voxpupuli/beaker-hostgenerator/pull/425) ([ekohl](https://github.com/ekohl))
13
+
14
+ ## [3.1.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/3.1.0) (2025-08-12)
15
+
16
+ [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/3.0.0...3.1.0)
17
+
18
+ **Implemented enhancements:**
19
+
20
+ - Add Debian 13 support and make CentOS & Debian easier to maintain [\#422](https://github.com/voxpupuli/beaker-hostgenerator/pull/422) ([ekohl](https://github.com/ekohl))
21
+
5
22
  ## [3.0.0](https://github.com/voxpupuli/beaker-hostgenerator/tree/3.0.0) (2025-08-03)
6
23
 
7
24
  [Full Changelog](https://github.com/voxpupuli/beaker-hostgenerator/compare/2.24.0...3.0.0)
data/Gemfile CHANGED
@@ -4,7 +4,7 @@ gemspec
4
4
 
5
5
  eval(File.read("#{__FILE__}.local"), binding) if File.exist? "#{__FILE__}.local"
6
6
 
7
- group :release do
7
+ group :release, optional: true do
8
8
  gem 'faraday-retry', require: false
9
9
  gem 'github_changelog_generator', require: false
10
10
  end
data/beaker-hostgenerator.gemspec CHANGED
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
28
28
  s.add_development_dependency 'rake', '~> 13.0'
29
29
  s.add_development_dependency 'rspec', '~> 3.0'
30
30
  s.add_development_dependency 'rspec-its', '>= 1.3.1', '< 3'
31
- s.add_development_dependency 'voxpupuli-rubocop', '~> 4.1.0'
31
+ s.add_development_dependency 'voxpupuli-rubocop', '~> 4.2.0'
32
32
 
33
33
  # Run time dependencies
34
34
  s.add_dependency 'deep_merge', '~> 1.0'
data/lib/beaker-hostgenerator/data.rb CHANGED
@@ -80,12 +80,13 @@ module BeakerHostGenerator
80
80
  def osinfo
81
81
  result = {}
82
82
 
83
- generate_osinfo do |name, platform|
83
+ generate_osinfo do |name, platform, packaging_platform = nil|
84
84
  result[name] = {
85
85
  general: {
86
86
  'platform' => platform,
87
87
  },
88
88
  }
89
+ result[name][:general]['packaging_platform'] = packaging_platform if packaging_platform
89
90
  end
90
91
 
91
92
  result.merge!({
@@ -133,148 +134,6 @@ module BeakerHostGenerator
133
134
  'image' => 'archlinux/archlinux',
134
135
  },
135
136
  },
136
- 'centos7-64' => {
137
- general: {
138
- 'platform' => 'el-7-x86_64',
139
- },
140
- },
141
- 'centos8-64' => {
142
- general: {
143
- 'platform' => 'el-8-x86_64',
144
- },
145
- vagrant: {
146
- 'box' => 'centos/stream8',
147
- 'box_url' => 'https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-Vagrant-8-latest.x86_64.vagrant-libvirt.box',
148
- },
149
- },
150
- 'centos9-64' => {
151
- general: {
152
- 'platform' => 'el-9-x86_64',
153
- },
154
- vagrant: {
155
- 'box' => 'centos/stream9',
156
- 'box_url' => 'https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-Vagrant-9-latest.x86_64.vagrant-libvirt.box',
157
- },
158
- },
159
- 'centos10-64' => {
160
- general: {
161
- 'platform' => 'el-10-x86_64',
162
- },
163
- vagrant: {
164
- 'box' => 'centos/stream10',
165
- 'box_url' => 'https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-Vagrant-10-latest.x86_64.vagrant-libvirt.box',
166
- },
167
- },
168
- 'debian10-64' => {
169
- general: {
170
- 'platform' => 'debian-10-amd64',
171
- },
172
- vagrant: {
173
- 'box' => 'debian/buster64',
174
- },
175
- },
176
- 'debian10-32' => {
177
- general: {
178
- 'platform' => 'debian-10-i386',
179
- },
180
- },
181
- 'debian11-64' => {
182
- general: {
183
- 'platform' => 'debian-11-amd64',
184
- },
185
- vagrant: {
186
- 'box' => 'debian/bullseye64',
187
- },
188
- },
189
- 'debian11-AARCH64' => {
190
- general: {
191
- 'platform' => 'debian-11-aarch64',
192
- },
193
- },
194
- 'debian12-64' => {
195
- general: {
196
- 'platform' => 'debian-12-amd64',
197
- },
198
- vagrant: {
199
- 'box' => 'debian/bookworm64',
200
- },
201
- },
202
- 'debian12-AARCH64' => {
203
- general: {
204
- 'platform' => 'debian-12-aarch64',
205
- },
206
- },
207
- 'panos61-64' => {
208
- general: {
209
- 'platform' => 'palo-alto-6.1.0-x86_64',
210
- },
211
- },
212
- 'panos71-64' => {
213
- general: {
214
- 'platform' => 'palo-alto-7.1.0-x86_64',
215
- },
216
- },
217
- 'panos81-64' => {
218
- general: {
219
- 'platform' => 'palo-alto-8.1.0-x86_64',
220
- },
221
- },
222
- 'osx1015-64' => {
223
- general: {
224
- 'platform' => 'osx-10.15-x86_64',
225
- },
226
- vmpooler: {
227
- 'template' => 'osx-1015-x86_64',
228
- },
229
- },
230
- 'osx11-64' => {
231
- general: {
232
- 'platform' => 'osx-11-x86_64',
233
- },
234
- vmpooler: {
235
- 'template' => 'macos-112-x86_64',
236
- },
237
- },
238
- 'osx11-ARM64' => {
239
- general: {
240
- 'platform' => 'osx-11-arm64',
241
- },
242
- vmpooler: {
243
- 'template' => 'macos-11-arm64',
244
- },
245
- },
246
- 'osx12-64' => {
247
- general: {
248
- 'platform' => 'osx-12-x86_64',
249
- },
250
- vmpooler: {
251
- 'template' => 'macos-12-x86_64',
252
- },
253
- },
254
- 'osx12-ARM64' => {
255
- general: {
256
- 'platform' => 'osx-12-arm64',
257
- },
258
- vmpooler: {
259
- 'template' => 'macos-12-arm64',
260
- },
261
- },
262
- 'osx13-64' => {
263
- general: {
264
- 'platform' => 'osx-13-x86_64',
265
- },
266
- vmpooler: {
267
- 'template' => 'macos-13-x86_64',
268
- },
269
- },
270
- 'osx13-ARM64' => {
271
- general: {
272
- 'platform' => 'osx-13-arm64',
273
- },
274
- vmpooler: {
275
- 'template' => 'macos-13-arm64',
276
- },
277
- },
278
137
  'redhat7-64' => {
279
138
  general: {
280
139
  'platform' => 'el-7-x86_64',
@@ -408,6 +267,22 @@ module BeakerHostGenerator
408
267
  'template' => 'rocky-9-arm64',
409
268
  },
410
269
  },
270
+ 'rocky10-64' => {
271
+ general: {
272
+ 'platform' => 'el-10-x86_64',
273
+ },
274
+ },
275
+ 'rocky10-AARCH64' => {
276
+ general: {
277
+ 'platform' => 'el-10-aarch64',
278
+ },
279
+ abs: {
280
+ 'template' => 'rocky-10-arm64',
281
+ },
282
+ vmpooler: {
283
+ 'template' => 'rocky-10-arm64',
284
+ },
285
+ },
411
286
  'almalinux8-64' => {
412
287
  general: {
413
288
  'platform' => 'el-8-x86_64',
@@ -429,6 +304,22 @@ module BeakerHostGenerator
429
304
  'template' => 'almalinux-9-arm64',
430
305
  },
431
306
  },
307
+ 'almalinux10-64' => {
308
+ general: {
309
+ 'platform' => 'el-10-x86_64',
310
+ },
311
+ },
312
+ 'almalinux10-AARCH64' => {
313
+ general: {
314
+ 'platform' => 'el-10-aarch64',
315
+ },
316
+ abs: {
317
+ 'template' => 'almalinux-10-arm64',
318
+ },
319
+ vmpooler: {
320
+ 'template' => 'almalinux-10-arm64',
321
+ },
322
+ },
432
323
  'redhat9-POWER' => {
433
324
  general: {
434
325
  'platform' => 'el-9-ppc64le',
@@ -498,130 +389,6 @@ module BeakerHostGenerator
498
389
  'template' => 'sles-15-x86_64',
499
390
  },
500
391
  },
501
- 'solaris10-32' => {
502
- general: {
503
- 'platform' => 'solaris-10-i386',
504
- },
505
- vmpooler: {
506
- 'template' => 'solaris-10-x86_64',
507
- },
508
- },
509
- 'solaris10-64' => {
510
- general: {
511
- 'platform' => 'solaris-10-i386',
512
- },
513
- vmpooler: {
514
- 'template' => 'solaris-10-x86_64',
515
- },
516
- },
517
- 'solaris10-SPARC' => {
518
- general: {
519
- 'platform' => 'solaris-10-sparc',
520
- },
521
- abs: {
522
- 'template' => 'solaris-10-sparc',
523
- },
524
- },
525
- 'solaris11-32' => {
526
- general: {
527
- 'platform' => 'solaris-11-i386',
528
- },
529
- vmpooler: {
530
- 'template' => 'solaris-11-x86_64',
531
- },
532
- },
533
- 'solaris11-64' => {
534
- general: {
535
- 'platform' => 'solaris-11-i386',
536
- },
537
- vmpooler: {
538
- 'template' => 'solaris-11-x86_64',
539
- },
540
- },
541
- 'solaris11-SPARC' => {
542
- general: {
543
- 'platform' => 'solaris-11-sparc',
544
- },
545
- abs: {
546
- 'template' => 'solaris-11-sparc',
547
- },
548
- },
549
- 'solaris112-32' => {
550
- general: {
551
- 'platform' => 'solaris-11.2-i386',
552
- 'packaging_platform' => 'solaris-11-i386',
553
- },
554
- vmpooler: {
555
- 'template' => 'solaris-112-x86_64',
556
- },
557
- },
558
- 'solaris112-64' => {
559
- general: {
560
- 'platform' => 'solaris-11.2-i386',
561
- 'packaging_platform' => 'solaris-11-i386',
562
- },
563
- vmpooler: {
564
- 'template' => 'solaris-112-x86_64',
565
- },
566
- },
567
- 'solaris114-32' => {
568
- general: {
569
- 'platform' => 'solaris-11.4-i386',
570
- 'packaging_platform' => 'solaris-11-i386',
571
- },
572
- vmpooler: {
573
- 'template' => 'solaris-114-x86_64',
574
- },
575
- },
576
- 'solaris114-64' => {
577
- general: {
578
- 'platform' => 'solaris-11.4-i386',
579
- 'packaging_platform' => 'solaris-11-i386',
580
- },
581
- vmpooler: {
582
- 'template' => 'solaris-114-x86_64',
583
- },
584
- },
585
- 'vro6-64' => {
586
- general: {
587
- 'platform' => 'sles-11-x86_64',
588
- },
589
- vmpooler: {
590
- 'template' => 'vro-6-x86_64',
591
- },
592
- },
593
- 'vro7-64' => {
594
- general: {
595
- 'platform' => 'sles-11-x86_64',
596
- },
597
- vmpooler: {
598
- 'template' => 'vro-7-x86_64',
599
- },
600
- },
601
- 'vro71-64' => {
602
- general: {
603
- 'platform' => 'sles-11-x86_64',
604
- },
605
- vmpooler: {
606
- 'template' => 'vro-71-x86_64',
607
- },
608
- },
609
- 'vro73-64' => {
610
- general: {
611
- 'platform' => 'sles-11-x86_64',
612
- },
613
- vmpooler: {
614
- 'template' => 'vro-73-x86_64',
615
- },
616
- },
617
- 'vro74-64' => {
618
- general: {
619
- 'platform' => 'sles-11-x86_64',
620
- },
621
- vmpooler: {
622
- 'template' => 'vro-74-x86_64',
623
- },
624
- },
625
392
  'windows2008-64' => {
626
393
  general: {
627
394
  'platform' => 'windows-2008-64',
@@ -1165,6 +932,20 @@ module BeakerHostGenerator
1165
932
  # AIX
1166
933
  yield %w[aix73-POWER aix-7.3-power]
1167
934
 
935
+ # CentOS
936
+ (7..10).each do |release|
937
+ yield ["centos#{release}-64", "el-#{release}-x86_64"]
938
+ end
939
+
940
+ # Debian
941
+ (10..13).each do |release|
942
+ yield ["debian#{release}-32", "debian-#{release}-i386"] if release < 11
943
+
944
+ yield ["debian#{release}-64", "debian-#{release}-amd64"]
945
+
946
+ yield ["debian#{release}-AARCH64", "debian-#{release}-aarch64"] if release >= 11
947
+ end
948
+
1168
949
  # Fedora
1169
950
  (19..41).each do |release|
1170
951
  # 32 bit support was dropped in Fedora 31
@@ -1221,10 +1002,33 @@ module BeakerHostGenerator
1221
1002
  end
1222
1003
 
1223
1004
  # macOS
1224
- yield %w[osx14-64 osx-14-x86_64]
1225
- yield %w[osx14-ARM64 osx-14-arm64]
1226
- yield %w[osx15-ARM64 osx-15-arm64]
1227
- yield %w[osx15-64 osx-15-x86_64]
1005
+ yield %w[osx1015-64 osx-10.15-x86_64]
1006
+ (11..15).each do |release|
1007
+ yield ["osx#{release}-64", "osx-#{release}-x86_64"]
1008
+ yield ["osx#{release}-ARM64", "osx-#{release}-arm64"]
1009
+ end
1010
+
1011
+ # Palo Alto OS
1012
+ yield %w[panos61-64 palo-alto-6.1.0-x86_64]
1013
+ yield %w[panos71-64 palo-alto-7.1.0-x86_64]
1014
+ yield %w[panos81-64 palo-alto-8.1.0-x86_64]
1015
+
1016
+ # Solaris
1017
+ (10..11).each do |release|
1018
+ yield ["solaris#{release}-32", "solaris-#{release}-i386"]
1019
+ # This is not a typo, 64 bits is i386
1020
+ yield ["solaris#{release}-64", "solaris-#{release}-i386"]
1021
+ yield ["solaris#{release}-SPARC", "solaris-#{release}-sparc"]
1022
+ end
1023
+ yield ['solaris112-32', 'solaris-11.2-i386', 'solaris-11-i386']
1024
+ yield ['solaris112-64', 'solaris-11.2-i386', 'solaris-11-i386']
1025
+ yield ['solaris114-32', 'solaris-11.4-i386', 'solaris-11-i386']
1026
+ yield ['solaris114-64', 'solaris-11.4-i386', 'solaris-11-i386']
1027
+
1028
+ # VRO
1029
+ %w[6 7 71 73 74].each do |release|
1030
+ yield ["vro#{release}-64", 'sles-11-x86_64']
1031
+ end
1228
1032
  end
1229
1033
  end
1230
1034
  end
data/lib/beaker-hostgenerator/hypervisor/abs.rb CHANGED
@@ -46,6 +46,11 @@ module BeakerHostGenerator
46
46
  base_config['template'] ||= "#{base_template}-#{arch}"
47
47
  when /^osx/
48
48
  base_config['template'] ||= base_config['platform']&.gsub(/^osx/, 'macos')
49
+ when /^solaris(\d+)/
50
+ version = Regexp.last_match(1)
51
+ arch = (node_info['bits'] == 'SPARC') ? 'sparc' : nil
52
+
53
+ base_config['template'] ||= "solaris-#{version}-#{arch}" if arch
49
54
  end
50
55
 
51
56
  base_config
data/lib/beaker-hostgenerator/hypervisor/vagrant.rb CHANGED
@@ -7,9 +7,17 @@ module BeakerHostGenerator
7
7
  class Vagrant < BeakerHostGenerator::Hypervisor::Interface
8
8
  include BeakerHostGenerator::Data
9
9
 
10
+ DEBIAN_VERSION_CODES = {
11
+ # No newer releases available
12
+ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1104105
13
+ '12' => 'bookworm',
14
+ '11' => 'bullseye',
15
+ '10' => 'buster',
16
+ }.freeze
17
+
10
18
  def generate_node(node_info, base_config, bhg_version)
11
19
  base_config['box'] = case node_info['ostype']
12
- when /^centos/, /^almalinux/
20
+ when /^almalinux/
13
21
  node_info['ostype'].sub(/(\d)/, '/\1')
14
22
  when /^fedora/
15
23
  node_info['ostype'].sub(/(\d)/, '/\1') + '-cloud-base'
@@ -17,6 +25,22 @@ module BeakerHostGenerator
17
25
  "generic/#{node_info['ostype']}"
18
26
  end
19
27
 
28
+ case node_info['platform']
29
+ when /^debian(\d+)-64/
30
+ version = Regexp.last_match(1)
31
+ if (codename = DEBIAN_VERSION_CODES[version])
32
+ base_config['box'] = "debian/#{codename}64"
33
+ end
34
+ when /^centos(\d+)-64/
35
+ version = Regexp.last_match(1)
36
+ if version.to_i >= 8
37
+ base_config['box'] = "centos/stream#{version}"
38
+ base_config['box_url'] = "https://cloud.centos.org/centos/#{version}-stream/x86_64/images/CentOS-Stream-Vagrant-#{version}-latest.x86_64.vagrant-libvirt.box"
39
+ else
40
+ base_config = "centos/#{version}"
41
+ end
42
+ end
43
+
20
44
  # We don't use this by default
21
45
  base_config['synced_folder'] = 'disabled'
22
46
 
data/lib/beaker-hostgenerator/hypervisor/vmpooler.rb CHANGED
@@ -22,7 +22,7 @@ module BeakerHostGenerator
22
22
  base_config['template'] ||= base_config['platform']&.gsub(/^el/, ::Regexp.last_match(1))
23
23
  when /^fedora/, /^opensuse/, /^panos/
24
24
  base_config['template'] ||= base_config['platform']
25
- when /^(debian|ubuntu)/
25
+ when /^(debian|ubuntu|vro)/
26
26
  os = Regexp.last_match(1)
27
27
  arch = case node_info['bits']
28
28
  when '64'
@@ -32,6 +32,28 @@ module BeakerHostGenerator
32
32
  end
33
33
 
34
34
  base_config['template'] ||= "#{node_info['ostype'].sub(os, "#{os}-")}-#{arch}" if arch
35
+ when /^osx(\d+)/
36
+ version = Regexp.last_match(1)
37
+ arch = case node_info['bits']
38
+ when '64'
39
+ 'x86_64'
40
+ when 'ARM64'
41
+ 'arm64'
42
+ end
43
+ name = version.start_with?('10') ? 'osx' : 'macos'
44
+ # Weird exception, but ok
45
+ version = '112' if version == '11' && arch == 'x86_64'
46
+
47
+ base_config['template'] ||= "#{name}-#{version}-#{arch}"
48
+ when /^solaris(\d+)/
49
+ version = Regexp.last_match(1)
50
+ # for some reason 32 bits is also using x86_64
51
+ arch = case node_info['bits']
52
+ when '64', '32'
53
+ 'x86_64'
54
+ end
55
+
56
+ base_config['template'] ||= "solaris-#{version}-#{arch}" if arch
35
57
  end
36
58
 
37
59
  base_config
data/lib/beaker-hostgenerator/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module BeakerHostGenerator
2
2
  module Version
3
- STRING = '3.0.0'
3
+ STRING = '3.2.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: 3.0.0
4
+ version: 3.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Branan Purvine-Riley
@@ -114,14 +114,14 @@ dependencies:
114
114
  requirements:
115
115
  - - "~>"
116
116
  - !ruby/object:Gem::Version
117
- version: 4.1.0
117
+ version: 4.2.0
118
118
  type: :development
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
122
  - - "~>"
123
123
  - !ruby/object:Gem::Version
124
- version: 4.1.0
124
+ version: 4.2.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: deep_merge
127
127
  requirement: !ruby/object:Gem::Requirement
@@ -148,6 +148,7 @@ extensions: []
148
148
  extra_rdoc_files: []
149
149
  files:
150
150
  - ".github/dependabot.yml"
151
+ - ".github/release.yml"
151
152
  - ".github/workflows/release.yml"
152
153
  - ".github/workflows/test.yml"
153
154
  - ".gitignore"