beaker-hostgenerator 1.18.1 → 2.0.0

Sign up to get free protection for your applications and to get access to all the features.
@@ -13,8 +13,9 @@ module BeakerHostGenerator
13
13
  # `include BeakerHostGenerator::Data` and then `<function>()`.
14
14
  module Data
15
15
  module_function
16
- MAIN_PE_VERSION='2023.0'
17
- PE_TARBALL_SERVER="https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local"
16
+
17
+ MAIN_PE_VERSION = '2023.0'
18
+ PE_TARBALL_SERVER = "https://artifactory.delivery.puppetlabs.net/artifactory/generic_enterprise__local"
18
19
 
19
20
  def pe_version
20
21
  ENV['pe_version']
@@ -43,7 +44,7 @@ module BeakerHostGenerator
43
44
 
44
45
  pe_family = $1
45
46
  gem_version = Gem::Version.new(pe_family)
46
- if(gem_version < Gem::Version.new("#{MAIN_PE_VERSION}") || version =~ /#{base_regex}-rc\d+\Z/)
47
+ if gem_version < Gem::Version.new("#{MAIN_PE_VERSION}") || version =~ /#{base_regex}-rc\d+\Z/
47
48
  pe_branch = pe_family
48
49
  else
49
50
  pe_branch = 'main'
@@ -56,10 +57,7 @@ module BeakerHostGenerator
56
57
 
57
58
  BASE_CONFIG = {
58
59
  'HOSTS' => {},
59
- 'CONFIG' => {
60
- 'nfs_server' => 'none',
61
- 'consoleport' => 443,
62
- }
60
+ 'CONFIG' => {},
63
61
  }
64
62
 
65
63
  def base_host_config(options)
@@ -88,47 +86,38 @@ module BeakerHostGenerator
88
86
  if release < 31
89
87
  result["fedora#{release}-32"] = {
90
88
  :general => {
91
- 'platform' => "fedora-#{release}-i386"
92
- }
89
+ 'platform' => "fedora-#{release}-i386",
90
+ },
93
91
  }
94
92
  end
95
93
 
96
94
  result["fedora#{release}-64"] = {
97
95
  :general => {
98
- 'platform' => "fedora-#{release}-x86_64"
99
- }
96
+ 'platform' => "fedora-#{release}-x86_64",
97
+ },
100
98
  }
101
99
  end
102
100
 
103
101
  # Ubuntu
104
102
  #
105
103
  # Generate LTS platforms
106
- (14..22).select(&:even?).each do |release|
107
- # 32 bit support was dropped in Ubuntu 18.04
108
- if release < 18
109
- result["ubuntu#{release}04-32"] = {
110
- :general => {
111
- 'platform' => "ubuntu-#{release}.04-i386"
112
- }
113
- }
114
- end
115
-
104
+ (18..22).select(&:even?).each do |release|
116
105
  result["ubuntu#{release}04-64"] = {
117
106
  :general => {
118
- 'platform' => "ubuntu-#{release}.04-amd64"
119
- }
107
+ 'platform' => "ubuntu-#{release}.04-amd64",
108
+ },
120
109
  }
121
110
 
122
111
  result["ubuntu#{release}04-POWER"] = {
123
112
  :general => {
124
- 'platform' => "ubuntu-#{release}.04-ppc64el"
125
- }
113
+ 'platform' => "ubuntu-#{release}.04-ppc64el",
114
+ },
126
115
  }
127
116
 
128
117
  result["ubuntu#{release}04-AARCH64"] = {
129
118
  :general => {
130
- 'platform' => "ubuntu-#{release}.04-aarch64"
131
- }
119
+ 'platform' => "ubuntu-#{release}.04-aarch64",
120
+ },
132
121
  }
133
122
  end
134
123
 
@@ -137,51 +126,44 @@ module BeakerHostGenerator
137
126
  unless release.even?
138
127
  result["ubuntu#{release}04-64"] = {
139
128
  :general => {
140
- 'platform' => "ubuntu-#{release}.04-amd64"
141
- }
129
+ 'platform' => "ubuntu-#{release}.04-amd64",
130
+ },
142
131
  }
143
132
  end
144
133
 
145
134
  result["ubuntu#{release}10-64"] = {
146
135
  :general => {
147
- 'platform' => "ubuntu-#{release}.10-amd64"
148
- }
136
+ 'platform' => "ubuntu-#{release}.10-amd64",
137
+ },
149
138
  }
150
139
  end
151
140
 
152
- result.merge!({
153
- 'aix53-POWER' => {
154
- :general => {
155
- 'platform' => 'aix-5.3-power'
156
- },
157
- :abs => {
158
- 'template' => 'aix-5.3-power'
159
- }
160
- },
161
- 'aix61-POWER' => {
141
+ # FreeBSD
142
+ (12..13).each do |release|
143
+ result["freebsd#{release}-64"] = {
162
144
  :general => {
163
- 'platform' => 'aix-6.1-power'
145
+ 'platform' => "freebsd-#{release}-amd64",
164
146
  },
165
- :abs => {
166
- 'template' => 'aix-6.1-power'
167
- }
168
- },
147
+ }
148
+ end
149
+
150
+ result.merge!({
169
151
  'aix71-POWER' => {
170
152
  :general => {
171
- 'platform' => 'aix-7.1-power'
153
+ 'platform' => 'aix-7.1-power',
172
154
  },
173
155
  :abs => {
174
- 'template' => 'aix-7.1-power'
175
- }
156
+ 'template' => 'aix-7.1-power',
157
+ },
176
158
  },
177
159
  'aix72-POWER' => {
178
160
  :general => {
179
161
  'platform' => 'aix-7.2-power',
180
- 'packaging_platform' => 'aix-7.1-power'
162
+ 'packaging_platform' => 'aix-7.1-power',
181
163
  },
182
164
  :abs => {
183
- 'template' => 'aix-7.2-power'
184
- }
165
+ 'template' => 'aix-7.2-power',
166
+ },
185
167
  },
186
168
  'almalinux8-64' => {
187
169
  :general => {
@@ -190,9 +172,9 @@ module BeakerHostGenerator
190
172
  :docker => {
191
173
  'docker_image_commands' => [
192
174
  'cp /bin/true /sbin/agetty',
193
- 'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
194
- ]
195
- }
175
+ 'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en',
176
+ ],
177
+ },
196
178
  },
197
179
  'almalinux9-64' => {
198
180
  :general => {
@@ -201,33 +183,33 @@ module BeakerHostGenerator
201
183
  :docker => {
202
184
  'docker_image_commands' => [
203
185
  'cp /bin/true /sbin/agetty',
204
- 'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
205
- ]
206
- }
186
+ 'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en',
187
+ ],
188
+ },
207
189
  },
208
190
  'amazon6-64' => {
209
191
  :general => {
210
- 'platform' => 'el-6-x86_64'
192
+ 'platform' => 'el-6-x86_64',
211
193
  },
212
194
  :abs => {
213
- 'template' => 'amazon-6-x86_64'
214
- }
195
+ 'template' => 'amazon-6-x86_64',
196
+ },
215
197
  },
216
198
  'amazon7-64' => {
217
199
  :general => {
218
- 'platform' => 'el-7-x86_64'
200
+ 'platform' => 'el-7-x86_64',
219
201
  },
220
202
  :abs => {
221
- 'template' => 'amazon-7-x86_64'
222
- }
203
+ 'template' => 'amazon-7-x86_64',
204
+ },
223
205
  },
224
206
  'amazon7-ARM64' => {
225
207
  :general => {
226
- 'platform' => 'el-7-aarch64'
208
+ 'platform' => 'el-7-aarch64',
227
209
  },
228
210
  :abs => {
229
- 'template' => 'amazon-7-arm64'
230
- }
211
+ 'template' => 'amazon-7-arm64',
212
+ },
231
213
  },
232
214
  'archlinuxrolling-64' => {
233
215
  :general => {
@@ -238,75 +220,22 @@ module BeakerHostGenerator
238
220
  },
239
221
  :docker => {
240
222
  'image' => 'archlinux/archlinux',
241
- }
242
- },
243
- 'arista4-32' => {
244
- :general => {
245
- 'platform' => 'eos-4-i386'
246
223
  },
247
- :vmpooler => {
248
- 'template' => 'arista-4-i386'
249
- }
250
- },
251
- 'centos4-32' => {
252
- :general => {
253
- 'platform' => 'el-4-i386'
254
- }
255
- },
256
- 'centos4-64' => {
257
- :general => {
258
- 'platform' => 'el-4-x86_64'
259
- }
260
- },
261
- 'centos5-32' => {
262
- :general => {
263
- 'platform' => 'el-5-i386'
264
- }
265
- },
266
- 'centos5-64' => {
267
- :general => {
268
- 'platform' => 'el-5-x86_64'
269
- },
270
- :docker => {
271
- 'docker_image_commands' => [
272
- 'cp /bin/true /sbin/mingetty',
273
- 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which',
274
- 'sed -i -e "/mingetty/d" /etc/inittab'
275
- ]
276
- }
277
- },
278
- 'centos6-32' => {
279
- :general => {
280
- 'platform' => 'el-6-i386'
281
- }
282
- },
283
- 'centos6-64' => {
284
- :general => {
285
- 'platform' => 'el-6-x86_64'
286
- },
287
- :docker => {
288
- 'docker_image_commands' => [
289
- 'cp /bin/true /sbin/mingetty',
290
- 'rm -rf /var/run/network/*',
291
- 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which',
292
- 'rm /etc/init/tty.conf'
293
- ]
294
- }
295
224
  },
296
225
  'centos7-64' => {
297
226
  :general => {
298
- 'platform' => 'el-7-x86_64'
227
+ 'platform' => 'el-7-x86_64',
299
228
  },
300
229
  :docker => {
301
230
  'docker_image_commands' => [
302
231
  'cp /bin/true /sbin/agetty',
303
- 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which ss'
304
- ]
305
- }
232
+ 'yum install -y crontabs initscripts iproute openssl sysvinit-tools tar wget which ss',
233
+ ],
234
+ },
306
235
  },
307
236
  'centos8-64' => {
308
237
  :general => {
309
- 'platform' => 'el-8-x86_64'
238
+ 'platform' => 'el-8-x86_64',
310
239
  },
311
240
  :vagrant => {
312
241
  'box' => 'centos/stream8',
@@ -315,747 +244,334 @@ module BeakerHostGenerator
315
244
  'image' => 'quay.io/centos/centos:stream8',
316
245
  'docker_image_commands' => [
317
246
  'cp /bin/true /sbin/agetty',
318
- 'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en hostname'
319
- ]
320
- }
321
- },
322
- 'centos9-64' => {
323
- :general => {
324
- 'platform' => 'el-9-x86_64'
325
- },
326
- :docker => {
327
- 'image' => 'quay.io/centos/centos:stream9',
328
- 'docker_image_commands' => [
329
- 'cp /bin/true /sbin/agetty',
330
- 'dnf install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
331
- ]
332
- }
333
- },
334
- # Deprecated
335
- 'cisconx-64' => {
336
- :general => {
337
- 'platform' => 'cisco_nexus-7-x86_64',
338
- 'packaging_platform' => 'cisco-wrlinux-5-x86_64',
339
- 'vrf' => 'management',
340
- 'ssh' => {
341
- 'user' => 'beaker'
342
- }
343
- },
344
- :vmpooler => {
345
- 'template' => 'cisco-nxos-9k-x86_64'
346
- }
347
- },
348
- # Deprecated
349
- 'ciscon7k-64' => {
350
- :general => {
351
- 'platform' => 'cisco_nexus-7k-x86_64',
352
- 'packaging_platform' => 'cisco-wrlinux-5-x86_64',
353
- 'vrf' => 'management',
354
- 'ssh' => {
355
- 'user' => 'admin'
356
- }
357
- },
358
- :abs => {
359
- 'template' => 'cisco-n7k-7k-x86_64'
360
- }
361
- },
362
- # Deprecated
363
- 'cisconxhw-64' => {
364
- :general => {
365
- 'platform' => 'cisco_nexus-7-x86_64',
366
- 'packaging_platform' => 'cisco-wrlinux-5-x86_64',
367
- 'vrf' => 'management',
368
- 'ssh' => {
369
- 'user' => 'devops'
370
- }
371
- },
372
- :abs => {
373
- 'template' => 'cisco-nxos_hw-9k-x86_64'
374
- }
375
- },
376
- 'cisco_n9k-VM' => {
377
- :general => {
378
- 'platform' => 'cisco_nexus-7-x86_64',
379
- 'packaging_platform' => 'cisco-wrlinux-5-x86_64',
380
- 'vrf' => 'management',
381
- 'ssh' => {
382
- 'user' => 'beaker'
383
- }
384
- },
385
- :vmpooler => {
386
- 'template' => 'cisco-nxos-9k-x86_64'
387
- }
388
- },
389
- 'cisco_n7k-HW' => {
390
- :general => {
391
- 'platform' => 'cisco_nexus-7k-x86_64',
392
- 'packaging_platform' => 'cisco-wrlinux-5-x86_64',
393
- 'vrf' => 'management',
394
- 'ssh' => {
395
- 'user' => 'admin'
396
- }
397
- },
398
- :abs => {
399
- 'template' => 'cisco-n7k-x86_64'
400
- }
401
- },
402
- 'cisco_n7k_vdc-HW' => {
403
- :general => {
404
- 'platform' => 'cisco_nexus-7k-x86_64',
405
- 'packaging_platform' => 'cisco-wrlinux-5-x86_64',
406
- 'vrf' => 'management',
407
- 'ssh' => {
408
- 'user' => 'admin'
409
- }
410
- },
411
- :abs => {
412
- 'template' => 'cisco-n7k_vdc-x86_64'
413
- }
414
- },
415
- 'cisco_n9k-HW' => {
416
- :general => {
417
- 'platform' => 'cisco_nexus-7-x86_64',
418
- 'packaging_platform' => 'cisco-wrlinux-5-x86_64',
419
- 'vrf' => 'management',
420
- 'ssh' => {
421
- 'user' => 'devops'
422
- }
423
- },
424
- :abs => {
425
- 'template' => 'cisco-n9k-x86_64'
426
- }
427
- },
428
- 'cisco_ios_c2960-HW' => {
429
- :general => {
430
- 'platform' => 'cisco_ios-12-arm32',
431
- 'ssh' => {
432
- 'user' => 'admin'
433
- }
434
- },
435
- :abs => {
436
- 'template' => 'cisco-ios_c2960-arm'
437
- }
438
- },
439
- 'cisco_ios_c3560-HW' => {
440
- :general => {
441
- 'platform' => 'cisco_ios-12-arm32',
442
- 'ssh' => {
443
- 'user' => 'admin'
444
- }
445
- },
446
- :abs => {
447
- 'template' => 'cisco-ios_c3560-arm'
448
- }
449
- },
450
- 'cisco_ios_c3750-HW' => {
451
- :general => {
452
- 'platform' => 'cisco_ios-12-arm32',
453
- 'ssh' => {
454
- 'user' => 'admin'
455
- }
456
- },
457
- :abs => {
458
- 'template' => 'cisco-ios_c3750-arm'
459
- }
460
- },
461
- 'cisco_ios_c4507r-HW' => {
462
- :general => {
463
- 'platform' => 'cisco_ios-12-arm32',
464
- 'ssh' => {
465
- 'user' => 'admin'
466
- }
467
- },
468
- :abs => {
469
- 'template' => 'cisco-ios_c4507r-arm'
470
- }
471
- },
472
- 'cisco_ios_c4948-HW' => {
473
- :general => {
474
- 'platform' => 'cisco_ios-12-arm32',
475
- 'ssh' => {
476
- 'user' => 'admin'
477
- }
478
- },
479
- :abs => {
480
- 'template' => 'cisco-ios_c4948-arm'
481
- }
482
- },
483
- 'cisco_ios_c6503-HW' => {
484
- :general => {
485
- 'platform' => 'cisco_ios-12-arm32',
486
- 'ssh' => {
487
- 'user' => 'admin'
488
- }
489
- },
490
- :abs => {
491
- 'template' => 'cisco-ios_c6503-arm'
492
- }
493
- },
494
- 'cisco_iosxe_c3650-HW' => {
495
- :general => {
496
- 'platform' => 'cisco_iosxec3650-arm32',
497
- 'ssh' => {
498
- 'user' => 'admin'
499
- }
500
- },
501
- :abs => {
502
- 'template' => 'cisco-iosxe_c3650-arm'
503
- }
504
- },
505
- 'cisco_iosxe_c4503-HW' => {
506
- :general => {
507
- 'platform' => 'cisco_iosxe-3-arm32',
508
- 'ssh' => {
509
- 'user' => 'admin'
510
- }
511
- },
512
- :abs => {
513
- 'template' => 'cisco-iosxe_c4503-arm'
514
- }
515
- },
516
- 'cisco_xr_9k-VM' => {
517
- :general => {
518
- 'platform' => 'cisco_ios_xr-6-x86_64',
519
- 'packaging_platform' => 'cisco-wrlinux-7-x86_64'
520
- },
521
- :vmpooler => {
522
- 'template' => 'cisco-exr-9k-x86_64'
523
- }
524
- },
525
- 'cumulus25-64' => {
526
- :general => {
527
- 'platform' => 'cumulus-2.5-x86_64',
528
- 'packaging_platform' => 'cumulus-2.2-amd64'
529
- },
530
- :vmpooler => {
531
- 'template' => 'cumulus-vx-25-x86_64'
532
- }
533
- },
534
- 'debian6-32' => {
535
- :general => {
536
- 'platform' => 'debian-6-i386'
537
- },
538
- :vmpooler => {
539
- 'template' => 'debian-6-i386'
540
- }
541
- },
542
- 'debian6-64' => {
543
- :general => {
544
- 'platform' => 'debian-6-amd64'
545
- },
546
- :vmpooler => {
547
- 'template' => 'debian-6-x86_64'
548
- }
549
- },
550
- 'debian7-32' => {
551
- :general => {
552
- 'platform' => 'debian-7-i386'
553
- },
554
- :vmpooler => {
555
- 'template' => 'debian-7-i386'
556
- }
557
- },
558
- 'debian7-64' => {
559
- :general => {
560
- 'platform' => 'debian-7-amd64'
561
- },
562
- :docker => {
563
- 'docker_image_commands' => [
564
- 'cp /bin/true /sbin/getty',
565
- 'apt-get update && apt-get install -y cron locales-all net-tools wget'
247
+ 'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en hostname',
566
248
  ],
567
249
  },
568
- :vagrant => {
569
- 'box' => 'debian/wheezy64',
570
- },
571
- :vmpooler => {
572
- 'template' => 'debian-7-x86_64'
573
- }
574
250
  },
575
- 'debian8-32' => {
576
- :general => {
577
- 'platform' => 'debian-8-i386'
578
- },
579
- :vmpooler => {
580
- 'template' => 'debian-8-i386'
581
- }
582
- },
583
- 'debian8-64' => {
251
+ 'centos9-64' => {
584
252
  :general => {
585
- 'platform' => 'debian-8-amd64'
586
- },
587
- :docker => {
588
- 'docker_image_commands' => [
589
- 'cp /bin/true /sbin/agetty',
590
- 'rm -f /usr/sbin/policy-rc.d',
591
- 'apt-get update && apt-get install -y cron locales-all net-tools wget apt-transport-https'
592
- ]
253
+ 'platform' => 'el-9-x86_64',
593
254
  },
594
255
  :vagrant => {
595
- 'box' => 'debian/jessie64',
596
- },
597
- :vmpooler => {
598
- 'template' => 'debian-8-x86_64'
599
- }
600
- },
601
- 'debian9-32' => {
602
- :general => {
603
- 'platform' => 'debian-9-i386'
604
- },
605
- :vmpooler => {
606
- 'template' => 'debian-9-i386'
607
- },
608
- :docker => {
609
- 'docker_image_commands' => [
610
- 'cp /bin/true /sbin/agetty',
611
- 'rm -f /usr/sbin/policy-rc.d',
612
- 'apt-get update && apt-get install -y cron locales-all net-tools wget apt-transport-https'
613
- ]
614
- }
615
- },
616
- 'debian9-64' => {
617
- :general => {
618
- 'platform' => 'debian-9-amd64'
256
+ 'box' => 'centos/stream9',
257
+ 'box_url' => 'https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-Vagrant-9-20230410.0.x86_64.vagrant-libvirt.box',
619
258
  },
620
259
  :docker => {
260
+ 'image' => 'quay.io/centos/centos:stream9',
621
261
  'docker_image_commands' => [
622
262
  'cp /bin/true /sbin/agetty',
623
- 'rm -f /usr/sbin/policy-rc.d',
624
- 'apt-get update && apt-get install -y cron locales-all net-tools wget systemd-sysv gnupg apt-transport-https'
625
- ]
626
- },
627
- :vagrant => {
628
- 'box' => 'debian/stretch64',
263
+ 'dnf install -y crontabs initscripts iproute openssl wget which glibc-langpack-en hostname',
264
+ ],
629
265
  },
630
- :vmpooler => {
631
- 'template' => 'debian-9-x86_64'
632
- }
633
266
  },
634
267
  'debian10-64' => {
635
268
  :general => {
636
- 'platform' => 'debian-10-amd64'
269
+ 'platform' => 'debian-10-amd64',
637
270
  },
638
271
  :docker => {
639
272
  'docker_image_commands' => [
640
273
  'cp /bin/true /sbin/agetty',
641
274
  'rm -f /usr/sbin/policy-rc.d',
642
- 'apt-get update && apt-get install -y cron locales-all net-tools wget gnupg'
643
- ]
275
+ 'apt-get update && apt-get install -y cron locales-all net-tools wget gnupg',
276
+ ],
644
277
  },
645
278
  :vagrant => {
646
279
  'box' => 'debian/buster64',
647
280
  },
648
281
  :vmpooler => {
649
- 'template' => 'debian-10-x86_64'
650
- }
282
+ 'template' => 'debian-10-x86_64',
283
+ },
651
284
  },
652
285
  'debian10-32' => {
653
286
  :general => {
654
- 'platform' => 'debian-10-i386'
287
+ 'platform' => 'debian-10-i386',
655
288
  },
656
289
  :docker => {
657
290
  'docker_image_commands' => [
658
291
  'cp /bin/true /sbin/agetty',
659
292
  'rm -f /usr/sbin/policy-rc.d',
660
- 'apt-get update && apt-get install -y cron locales-all net-tools wget gnupg'
661
- ]
293
+ 'apt-get update && apt-get install -y cron locales-all net-tools wget gnupg',
294
+ ],
662
295
  },
663
296
  :vmpooler => {
664
- 'template' => 'debian-10-i386'
665
- }
297
+ 'template' => 'debian-10-i386',
298
+ },
666
299
  },
667
300
  'debian11-64' => {
668
301
  :general => {
669
- 'platform' => 'debian-11-amd64'
302
+ 'platform' => 'debian-11-amd64',
670
303
  },
671
304
  :docker => {
672
305
  'docker_image_commands' => [
673
306
  'cp /bin/true /sbin/agetty',
674
307
  'rm -f /usr/sbin/policy-rc.d',
675
- 'apt-get update && apt-get install -y cron locales-all net-tools wget gnupg iproute2'
676
- ]
308
+ 'apt-get update && apt-get install -y cron locales-all net-tools wget gnupg iproute2',
309
+ ],
677
310
  },
678
311
  :vagrant => {
679
312
  'box' => 'debian/bullseye64',
680
313
  },
681
314
  :vmpooler => {
682
- 'template' => 'debian-11-x86_64'
683
- }
684
- },
685
- 'fedora14-32' => {
686
- :general => {
687
- 'platform' => 'fedora-14-i386'
688
- }
689
- },
690
- 'huaweios6-POWER' => {
691
- :general => {
692
- 'platform' => 'huaweios-6-powerpc'
315
+ 'template' => 'debian-11-x86_64',
693
316
  },
694
- :abs => {
695
- 'template' => 'huaweios-6-powerpc'
696
- }
697
317
  },
698
318
  'panos61-64' => {
699
319
  :general => {
700
- 'platform' => 'palo-alto-6.1.0-x86_64'
320
+ 'platform' => 'palo-alto-6.1.0-x86_64',
701
321
  },
702
322
  :vmpooler => {
703
- 'template' => 'palo-alto-6.1.0-x86_64'
704
- }
323
+ 'template' => 'palo-alto-6.1.0-x86_64',
324
+ },
705
325
  },
706
326
  'panos71-64' => {
707
327
  :general => {
708
- 'platform' => 'palo-alto-7.1.0-x86_64'
328
+ 'platform' => 'palo-alto-7.1.0-x86_64',
709
329
  },
710
330
  :vmpooler => {
711
- 'template' => 'palo-alto-7.1.0-x86_64'
712
- }
713
- },
714
- 'panos81-64' => {
715
- :general => {
716
- 'platform' => 'palo-alto-8.1.0-x86_64'
331
+ 'template' => 'palo-alto-7.1.0-x86_64',
717
332
  },
718
- :vmpooler => {
719
- 'template' => 'palo-alto-8.1.0-x86_64'
720
- }
721
333
  },
722
- 'opensuse11-32' => {
334
+ 'panos81-64' => {
723
335
  :general => {
724
- 'platform' => 'opensuse-11-i386'
336
+ 'platform' => 'palo-alto-8.1.0-x86_64',
725
337
  },
726
338
  :vmpooler => {
727
- 'template' => 'opensuse-11-i386'
728
- }
729
- },
730
- 'opensuse11-64' => {
731
- :general => {
732
- 'platform' => 'opensuse-11-x86_64'
339
+ 'template' => 'palo-alto-8.1.0-x86_64',
733
340
  },
734
- :vmpooler => {
735
- 'template' => 'opensuse-11-x86_64'
736
- }
737
341
  },
738
342
  'opensuse15-32' => {
739
343
  :general => {
740
- 'platform' => 'opensuse-15-i386'
344
+ 'platform' => 'opensuse-15-i386',
741
345
  },
742
346
  :docker => {
743
347
  'docker_image_commands' => [
744
348
  'cp /bin/true /sbin/agetty',
745
- 'zypper install -y cron iproute2 tar wget which'
746
- ]
349
+ 'zypper install -y cron iproute2 tar wget which',
350
+ ],
747
351
  },
748
352
  :vmpooler => {
749
- 'template' => 'opensuse-15-i386'
750
- }
353
+ 'template' => 'opensuse-15-i386',
354
+ },
751
355
  },
752
356
  'opensuse15-64' => {
753
357
  :general => {
754
- 'platform' => 'opensuse-15-x86_64'
358
+ 'platform' => 'opensuse-15-x86_64',
755
359
  },
756
360
  :docker => {
757
361
  'docker_image_commands' => [
758
362
  'cp /bin/true /sbin/agetty',
759
- 'zypper install -y cron iproute2 tar wget which'
760
- ]
363
+ 'zypper install -y cron iproute2 tar wget which',
364
+ ],
761
365
  },
762
366
  :vmpooler => {
763
- 'template' => 'opensuse-15-x86_64'
764
- }
367
+ 'template' => 'opensuse-15-x86_64',
368
+ },
765
369
  },
766
370
  'opensuse42-32' => {
767
371
  :general => {
768
- 'platform' => 'opensuse-42-i386'
372
+ 'platform' => 'opensuse-42-i386',
769
373
  },
770
374
  :docker => {
771
375
  'docker_image_commands' => [
772
376
  'cp /bin/true /sbin/agetty',
773
- 'zypper install -y cron iproute2 tar wget which'
774
- ]
377
+ 'zypper install -y cron iproute2 tar wget which',
378
+ ],
775
379
  },
776
380
  :vmpooler => {
777
- 'template' => 'opensuse-42-i386'
778
- }
381
+ 'template' => 'opensuse-42-i386',
382
+ },
779
383
  },
780
384
  'opensuse42-64' => {
781
385
  :general => {
782
- 'platform' => 'opensuse-42-x86_64'
386
+ 'platform' => 'opensuse-42-x86_64',
783
387
  },
784
388
  :docker => {
785
389
  'docker_image_commands' => [
786
390
  'cp /bin/true /sbin/agetty',
787
- 'zypper install -y cron iproute2 tar wget which'
788
- ]
391
+ 'zypper install -y cron iproute2 tar wget which',
392
+ ],
789
393
  },
790
394
  :vmpooler => {
791
- 'template' => 'opensuse-42-x86_64'
792
- }
793
- },
794
- 'oracle5-32' => {
795
- :general => {
796
- 'platform' => 'el-5-i386'
395
+ 'template' => 'opensuse-42-x86_64',
797
396
  },
798
- :vmpooler => {
799
- 'template' => 'oracle-5-i386'
800
- }
801
- },
802
- 'oracle5-64' => {
803
- :general => {
804
- 'platform' => 'el-5-x86_64'
805
- },
806
- :vmpooler => {
807
- 'template' => 'oracle-5-x86_64'
808
- }
809
397
  },
810
398
  'oracle6-32' => {
811
399
  :general => {
812
- 'platform' => 'el-6-i386'
813
- },
814
- :vmpooler => {
815
- 'template' => 'oracle-6-i386'
816
- }
817
- },
818
- 'oracle6-64' => {
819
- :general => {
820
- 'platform' => 'el-6-x86_64'
821
- },
822
- :vmpooler => {
823
- 'template' => 'oracle-6-x86_64'
824
- }
825
- },
826
- 'oracle7-64' => {
827
- :general => {
828
- 'platform' => 'el-7-x86_64'
829
- },
830
- :vmpooler => {
831
- 'template' => 'oracle-7-x86_64'
832
- }
833
- },
834
- 'osx109-64' => {
835
- :general => {
836
- 'platform' => 'osx-10.9-x86_64'
400
+ 'platform' => 'el-6-i386',
837
401
  },
838
402
  :vmpooler => {
839
- 'template' => 'osx-109-x86_64'
840
- }
841
- },
842
- 'osx1010-64' => {
843
- :general => {
844
- 'platform' => 'osx-10.10-x86_64'
403
+ 'template' => 'oracle-6-i386',
845
404
  },
846
- :vmpooler => {
847
- 'template' => 'osx-1010-x86_64'
848
- }
849
405
  },
850
- 'osx1011-64' => {
851
- :general => {
852
- 'platform' => 'osx-10.11-x86_64'
853
- },
854
- :vmpooler => {
855
- 'template' => 'osx-1011-x86_64'
856
- }
857
- },
858
- 'osx1012-64' => {
406
+ 'oracle6-64' => {
859
407
  :general => {
860
- 'platform' => 'osx-10.12-x86_64'
408
+ 'platform' => 'el-6-x86_64',
861
409
  },
862
410
  :vmpooler => {
863
- 'template' => 'osx-1012-x86_64'
864
- }
865
- },
866
- 'osx1013-64' => {
867
- :general => {
868
- 'platform' => 'osx-10.13-x86_64'
411
+ 'template' => 'oracle-6-x86_64',
869
412
  },
870
- :vmpooler => {
871
- 'template' => 'osx-1013-x86_64'
872
- }
873
413
  },
874
- 'osx1014-64' => {
414
+ 'oracle7-64' => {
875
415
  :general => {
876
- 'platform' => 'osx-10.14-x86_64'
416
+ 'platform' => 'el-7-x86_64',
877
417
  },
878
418
  :vmpooler => {
879
- 'template' => 'osx-1014-x86_64'
880
- }
419
+ 'template' => 'oracle-7-x86_64',
420
+ },
881
421
  },
882
422
  'osx1015-64' => {
883
423
  :general => {
884
- 'platform' => 'osx-10.15-x86_64'
424
+ 'platform' => 'osx-10.15-x86_64',
885
425
  },
886
426
  :vmpooler => {
887
- 'template' => 'osx-1015-x86_64'
888
- }
427
+ 'template' => 'osx-1015-x86_64',
428
+ },
889
429
  },
890
430
  'osx11-64' => {
891
431
  :general => {
892
- 'platform' => 'osx-11-x86_64'
432
+ 'platform' => 'osx-11-x86_64',
893
433
  },
894
434
  :vmpooler => {
895
- 'template' => 'macos-112-x86_64'
896
- }
435
+ 'template' => 'macos-112-x86_64',
436
+ },
897
437
  },
898
438
  'osx11-ARM64' => {
899
439
  :general => {
900
- 'platform' => 'osx-11-arm64'
440
+ 'platform' => 'osx-11-arm64',
901
441
  },
902
442
  :vmpooler => {
903
- 'template' => 'macos-11-arm64'
904
- }
443
+ 'template' => 'macos-11-arm64',
444
+ },
905
445
  },
906
446
  'osx12-64' => {
907
447
  :general => {
908
- 'platform' => 'osx-12-x86_64'
448
+ 'platform' => 'osx-12-x86_64',
909
449
  },
910
450
  :vmpooler => {
911
- 'template' => 'macos-12-x86_64'
912
- }
913
- },
914
- 'osx12-ARM64' => {
915
- :general => {
916
- 'platform' => 'osx-12-arm64'
451
+ 'template' => 'macos-12-x86_64',
917
452
  },
918
- :vmpooler => {
919
- 'template' => 'macos-12-arm64'
920
- }
921
453
  },
922
- 'redhat4-32' => {
454
+ 'osx12-ARM64' => {
923
455
  :general => {
924
- 'platform' => 'el-4-i386'
456
+ 'platform' => 'osx-12-arm64',
925
457
  },
926
458
  :vmpooler => {
927
- 'template' => 'redhat-4-i386'
928
- }
929
- },
930
- 'redhat4-64' => {
931
- :general => {
932
- 'platform' => 'el-4-x86_64'
459
+ 'template' => 'macos-12-arm64',
933
460
  },
934
- :vmpooler => {
935
- 'template' => 'redhat-4-x86_64'
936
- }
937
461
  },
938
- 'redhat5-32' => {
462
+ 'osx13-64' => {
939
463
  :general => {
940
- 'platform' => 'el-5-i386'
464
+ 'platform' => 'osx-13-x86_64',
941
465
  },
942
466
  :vmpooler => {
943
- 'template' => 'redhat-5-i386'
944
- }
945
- },
946
- 'redhat5-64' => {
947
- :general => {
948
- 'platform' => 'el-5-x86_64'
467
+ 'template' => 'macos-13-x86_64',
949
468
  },
950
- :vmpooler => {
951
- 'template' => 'redhat-5-x86_64'
952
- }
953
469
  },
954
470
  'redhat6-32' => {
955
471
  :general => {
956
472
  'platform' => 'el-6-i386',
957
473
  },
958
474
  :vmpooler => {
959
- 'template' => 'redhat-6-i386'
960
- }
475
+ 'template' => 'redhat-6-i386',
476
+ },
961
477
  },
962
478
  'redhat6-64' => {
963
479
  :general => {
964
- 'platform' => 'el-6-x86_64'
480
+ 'platform' => 'el-6-x86_64',
965
481
  },
966
482
  :vmpooler => {
967
- 'template' => 'redhat-6-x86_64'
968
- }
483
+ 'template' => 'redhat-6-x86_64',
484
+ },
969
485
  },
970
486
  'redhat6-S390X' => {
971
487
  :general => {
972
- 'platform' => 'el-6-s390x'
488
+ 'platform' => 'el-6-s390x',
973
489
  },
974
490
  },
975
491
  'redhat7-64' => {
976
492
  :general => {
977
- 'platform' => 'el-7-x86_64'
493
+ 'platform' => 'el-7-x86_64',
978
494
  },
979
495
  :vmpooler => {
980
- 'template' => 'redhat-7-x86_64'
981
- }
496
+ 'template' => 'redhat-7-x86_64',
497
+ },
982
498
  },
983
499
  'redhatfips7-64' => {
984
500
  :general => {
985
501
  'platform' => 'el-7-x86_64',
986
- 'packaging_platform' => 'redhatfips-7-x86_64'
502
+ 'packaging_platform' => 'redhatfips-7-x86_64',
987
503
  },
988
504
  :vmpooler => {
989
- 'template' => 'redhat-fips-7-x86_64'
990
- }
505
+ 'template' => 'redhat-fips-7-x86_64',
506
+ },
991
507
  },
992
508
  'redhat7-POWER' => {
993
509
  :general => {
994
510
  'platform' => 'el-7-ppc64le',
995
511
  },
996
512
  :abs => {
997
- 'template' => 'redhat-7.3-power8'
998
- }
513
+ 'template' => 'redhat-7.3-power8',
514
+ },
999
515
  },
1000
516
  'redhat7-S390X' => {
1001
517
  :general => {
1002
- 'platform' => 'el-7-s390x'
518
+ 'platform' => 'el-7-s390x',
1003
519
  },
1004
520
  },
1005
521
  'redhat7-AARCH64' => {
1006
522
  :general => {
1007
- 'platform' => 'el-7-aarch64'
523
+ 'platform' => 'el-7-aarch64',
1008
524
  },
1009
525
  :abs => {
1010
- 'template' => 'centos-7-arm64'
526
+ 'template' => 'centos-7-arm64',
1011
527
  },
1012
528
  :vmpooler => {
1013
- 'template' => 'redhat-7-x86_64'
1014
- }
529
+ 'template' => 'redhat-7-x86_64',
530
+ },
1015
531
  },
1016
532
  'redhat8-64' => {
1017
533
  :general => {
1018
- 'platform' => 'el-8-x86_64'
534
+ 'platform' => 'el-8-x86_64',
1019
535
  },
1020
536
  :vmpooler => {
1021
- 'template' => 'redhat-8-x86_64'
1022
- }
537
+ 'template' => 'redhat-8-x86_64',
538
+ },
1023
539
  },
1024
540
  'redhatfips8-64' => {
1025
541
  :general => {
1026
542
  'platform' => 'el-8-x86_64',
1027
- 'packaging_platform' => 'redhatfips-8-x86_64'
543
+ 'packaging_platform' => 'redhatfips-8-x86_64',
1028
544
  },
1029
545
  :vmpooler => {
1030
- 'template' => 'redhat-fips-8-x86_64'
1031
- }
546
+ 'template' => 'redhat-fips-8-x86_64',
547
+ },
1032
548
  },
1033
549
  'redhat8-AARCH64' => {
1034
550
  :general => {
1035
- 'platform' => 'el-8-aarch64'
551
+ 'platform' => 'el-8-aarch64',
1036
552
  },
1037
553
  :abs => {
1038
- 'template' => 'redhat-8-arm64'
554
+ 'template' => 'redhat-8-arm64',
1039
555
  },
1040
556
  :vmpooler => {
1041
- 'template' => 'redhat-8-x86_64'
1042
- }
557
+ 'template' => 'redhat-8-x86_64',
558
+ },
1043
559
  },
1044
560
  'redhat8-POWER' => {
1045
561
  :general => {
1046
- 'platform' => 'el-8-ppc64le'
562
+ 'platform' => 'el-8-ppc64le',
1047
563
  },
1048
564
  :abs => {
1049
- 'template' => 'redhat-8-power8'
1050
- }
565
+ 'template' => 'redhat-8-power8',
566
+ },
1051
567
  },
1052
568
  'redhat9-64' => {
1053
569
  :general => {
1054
- 'platform' => 'el-9-x86_64'
570
+ 'platform' => 'el-9-x86_64',
1055
571
  },
1056
572
  :vmpooler => {
1057
- 'template' => 'redhat-9-x86_64'
1058
- }
573
+ 'template' => 'redhat-9-x86_64',
574
+ },
1059
575
  },
1060
576
  'rocky8-64' => {
1061
577
  :general => {
@@ -1064,9 +580,9 @@ module BeakerHostGenerator
1064
580
  :docker => {
1065
581
  'docker_image_commands' => [
1066
582
  'cp /bin/true /sbin/agetty',
1067
- 'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
1068
- ]
1069
- }
583
+ 'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en',
584
+ ],
585
+ },
1070
586
  },
1071
587
  'rocky9-64' => {
1072
588
  :general => {
@@ -1075,686 +591,618 @@ module BeakerHostGenerator
1075
591
  :docker => {
1076
592
  'docker_image_commands' => [
1077
593
  'cp /bin/true /sbin/agetty',
1078
- 'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
1079
- ]
1080
- }
1081
- },
1082
- 'scientific5-32' => {
1083
- :general => {
1084
- 'platform' => 'el-5-i386'
1085
- },
1086
- :vmpooler => {
1087
- 'template' => 'scientific-5-i386'
1088
- }
1089
- },
1090
- 'scientific5-64' => {
1091
- :general => {
1092
- 'platform' => 'el-5-x86_64'
1093
- },
1094
- :vmpooler => {
1095
- 'template' => 'scientific-5-x86_64'
1096
- }
1097
- },
1098
- 'scientific6-32' => {
1099
- :general => {
1100
- 'platform' => 'el-6-i386'
1101
- },
1102
- :vmpooler => {
1103
- 'template' => 'scientific-6-i386'
1104
- }
1105
- },
1106
- 'scientific6-64' => {
1107
- :general => {
1108
- 'platform' => 'el-6-x86_64'
594
+ 'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en',
595
+ ],
1109
596
  },
1110
- :vmpooler => {
1111
- 'template' => 'scientific-6-x86_64'
1112
- }
1113
597
  },
1114
598
  'scientific7-64' => {
1115
599
  :general => {
1116
- 'platform' => 'el-7-x86_64'
600
+ 'platform' => 'el-7-x86_64',
1117
601
  },
1118
602
  :vmpooler => {
1119
- 'template' => 'scientific-7-x86_64'
1120
- }
1121
- },
1122
- 'sles10-32' => {
1123
- :general => {
1124
- 'platform' => 'sles-10-i386'
1125
- },
1126
- :vmpooler => {
1127
- 'template' => 'sles-10-i386'
1128
- }
1129
- },
1130
- 'sles10-64' => {
1131
- :general => {
1132
- 'platform' => 'sles-10-x86_64'
603
+ 'template' => 'scientific-7-x86_64',
1133
604
  },
1134
- :vmpooler => {
1135
- 'template' => 'sles-10-x86_64'
1136
- }
1137
605
  },
1138
606
  'sles11-32' => {
1139
607
  :general => {
1140
- 'platform' => 'sles-11-i386'
608
+ 'platform' => 'sles-11-i386',
1141
609
  },
1142
610
  :vmpooler => {
1143
- 'template' => 'sles-11-i386'
1144
- }
611
+ 'template' => 'sles-11-i386',
612
+ },
1145
613
  },
1146
614
  'sles11-64' => {
1147
615
  :general => {
1148
- 'platform' => 'sles-11-x86_64'
616
+ 'platform' => 'sles-11-x86_64',
1149
617
  },
1150
618
  :vmpooler => {
1151
- 'template' => 'sles-11-x86_64'
1152
- }
619
+ 'template' => 'sles-11-x86_64',
620
+ },
1153
621
  },
1154
622
  'sles11-S390X' => {
1155
623
  :general => {
1156
- 'platform' => 'sles-11-s390x'
624
+ 'platform' => 'sles-11-s390x',
1157
625
  },
1158
626
  },
1159
627
  'sles12-64' => {
1160
628
  :general => {
1161
- 'platform' => 'sles-12-x86_64'
629
+ 'platform' => 'sles-12-x86_64',
1162
630
  },
1163
631
  :vmpooler => {
1164
- 'template' => 'sles-12-x86_64'
1165
- }
632
+ 'template' => 'sles-12-x86_64',
633
+ },
1166
634
  },
1167
635
  'sles12-S390X' => {
1168
636
  :general => {
1169
- 'platform' => 'sles-12-s390x'
1170
- }
637
+ 'platform' => 'sles-12-s390x',
638
+ },
1171
639
  },
1172
640
  'sles12-POWER' => {
1173
641
  :general => {
1174
- 'platform' => 'sles-12-ppc64le'
642
+ 'platform' => 'sles-12-ppc64le',
1175
643
  },
1176
644
  :abs => {
1177
- 'template' => 'sles-12-power8'
1178
- }
645
+ 'template' => 'sles-12-power8',
646
+ },
1179
647
  },
1180
648
  'sles15-64' => {
1181
649
  :general => {
1182
- 'platform' => 'sles-15-x86_64'
650
+ 'platform' => 'sles-15-x86_64',
1183
651
  },
1184
652
  :vmpooler => {
1185
- 'template' => 'sles-15-x86_64'
1186
- }
653
+ 'template' => 'sles-15-x86_64',
654
+ },
1187
655
  },
1188
656
  'solaris10-32' => {
1189
657
  :general => {
1190
- 'platform' => 'solaris-10-i386'
658
+ 'platform' => 'solaris-10-i386',
1191
659
  },
1192
660
  :vmpooler => {
1193
- 'template' => 'solaris-10-x86_64'
1194
- }
661
+ 'template' => 'solaris-10-x86_64',
662
+ },
1195
663
  },
1196
664
  'solaris10-64' => {
1197
665
  :general => {
1198
- 'platform' => 'solaris-10-i386'
666
+ 'platform' => 'solaris-10-i386',
1199
667
  },
1200
668
  :vmpooler => {
1201
- 'template' => 'solaris-10-x86_64'
1202
- }
669
+ 'template' => 'solaris-10-x86_64',
670
+ },
1203
671
  },
1204
672
  'solaris10-SPARC' => {
1205
673
  :general => {
1206
- 'platform' => 'solaris-10-sparc'
674
+ 'platform' => 'solaris-10-sparc',
1207
675
  },
1208
676
  :abs => {
1209
- 'template' => 'solaris-10-sparc'
1210
- }
677
+ 'template' => 'solaris-10-sparc',
678
+ },
1211
679
  },
1212
680
  'solaris11-32' => {
1213
681
  :general => {
1214
- 'platform' => 'solaris-11-i386'
682
+ 'platform' => 'solaris-11-i386',
1215
683
  },
1216
684
  :vmpooler => {
1217
- 'template' => 'solaris-11-x86_64'
1218
- }
685
+ 'template' => 'solaris-11-x86_64',
686
+ },
1219
687
  },
1220
688
  'solaris11-64' => {
1221
689
  :general => {
1222
- 'platform' => 'solaris-11-i386'
690
+ 'platform' => 'solaris-11-i386',
1223
691
  },
1224
692
  :vmpooler => {
1225
- 'template' => 'solaris-11-x86_64'
1226
- }
693
+ 'template' => 'solaris-11-x86_64',
694
+ },
1227
695
  },
1228
696
  'solaris11-SPARC' => {
1229
697
  :general => {
1230
- 'platform' => 'solaris-11-sparc'
698
+ 'platform' => 'solaris-11-sparc',
1231
699
  },
1232
700
  :abs => {
1233
- 'template' => 'solaris-11-sparc'
1234
- }
701
+ 'template' => 'solaris-11-sparc',
702
+ },
1235
703
  },
1236
704
  'solaris112-32' => {
1237
705
  :general => {
1238
706
  'platform' => 'solaris-11.2-i386',
1239
- 'packaging_platform' => 'solaris-11-i386'
707
+ 'packaging_platform' => 'solaris-11-i386',
1240
708
  },
1241
709
  :vmpooler => {
1242
- 'template' => 'solaris-112-x86_64'
1243
- }
710
+ 'template' => 'solaris-112-x86_64',
711
+ },
1244
712
  },
1245
713
  'solaris112-64' => {
1246
714
  :general => {
1247
715
  'platform' => 'solaris-11.2-i386',
1248
- 'packaging_platform' => 'solaris-11-i386'
716
+ 'packaging_platform' => 'solaris-11-i386',
1249
717
  },
1250
718
  :vmpooler => {
1251
- 'template' => 'solaris-112-x86_64'
1252
- }
719
+ 'template' => 'solaris-112-x86_64',
720
+ },
1253
721
  },
1254
722
  'solaris114-32' => {
1255
723
  :general => {
1256
724
  'platform' => 'solaris-11.4-i386',
1257
- 'packaging_platform' => 'solaris-11-i386'
725
+ 'packaging_platform' => 'solaris-11-i386',
1258
726
  },
1259
727
  :vmpooler => {
1260
- 'template' => 'solaris-114-x86_64'
1261
- }
728
+ 'template' => 'solaris-114-x86_64',
729
+ },
1262
730
  },
1263
731
  'solaris114-64' => {
1264
732
  :general => {
1265
733
  'platform' => 'solaris-11.4-i386',
1266
- 'packaging_platform' => 'solaris-11-i386'
734
+ 'packaging_platform' => 'solaris-11-i386',
1267
735
  },
1268
736
  :vmpooler => {
1269
- 'template' => 'solaris-114-x86_64'
1270
- }
737
+ 'template' => 'solaris-114-x86_64',
738
+ },
1271
739
  },
1272
740
  'vro6-64' => {
1273
741
  :general => {
1274
- 'platform' => 'sles-11-x86_64'
742
+ 'platform' => 'sles-11-x86_64',
1275
743
  },
1276
744
  :vmpooler => {
1277
- 'template' => 'vro-6-x86_64'
1278
- }
745
+ 'template' => 'vro-6-x86_64',
746
+ },
1279
747
  },
1280
748
  'vro7-64' => {
1281
749
  :general => {
1282
- 'platform' => 'sles-11-x86_64'
750
+ 'platform' => 'sles-11-x86_64',
1283
751
  },
1284
752
  :vmpooler => {
1285
- 'template' => 'vro-7-x86_64'
1286
- }
753
+ 'template' => 'vro-7-x86_64',
754
+ },
1287
755
  },
1288
756
  'vro71-64' => {
1289
757
  :general => {
1290
- 'platform' => 'sles-11-x86_64'
758
+ 'platform' => 'sles-11-x86_64',
1291
759
  },
1292
760
  :vmpooler => {
1293
- 'template' => 'vro-71-x86_64'
1294
- }
761
+ 'template' => 'vro-71-x86_64',
762
+ },
1295
763
  },
1296
764
  'vro73-64' => {
1297
765
  :general => {
1298
- 'platform' => 'sles-11-x86_64'
766
+ 'platform' => 'sles-11-x86_64',
1299
767
  },
1300
768
  :vmpooler => {
1301
- 'template' => 'vro-73-x86_64'
1302
- }
769
+ 'template' => 'vro-73-x86_64',
770
+ },
1303
771
  },
1304
772
  'vro74-64' => {
1305
773
  :general => {
1306
- 'platform' => 'sles-11-x86_64'
774
+ 'platform' => 'sles-11-x86_64',
1307
775
  },
1308
776
  :vmpooler => {
1309
- 'template' => 'vro-74-x86_64'
1310
- }
777
+ 'template' => 'vro-74-x86_64',
778
+ },
1311
779
  },
1312
780
  'windows2008-64' => {
1313
781
  :general => {
1314
782
  'platform' => 'windows-2008-64',
1315
783
  'packaging_platform' => 'windows-2012-x64',
1316
- 'ruby_arch' => 'x64'
784
+ 'ruby_arch' => 'x64',
1317
785
  },
1318
786
  :vmpooler => {
1319
- 'template' => 'win-2008-x86_64'
1320
- }
787
+ 'template' => 'win-2008-x86_64',
788
+ },
1321
789
  },
1322
790
  'windows2008-6432' => {
1323
791
  :general => {
1324
792
  'platform' => 'windows-2008-64',
1325
793
  'packaging_platform' => 'windows-2012-x64',
1326
- 'ruby_arch' => 'x86'
794
+ 'ruby_arch' => 'x86',
1327
795
  },
1328
796
  :vmpooler => {
1329
- 'template' => 'win-2008-x86_64'
1330
- }
797
+ 'template' => 'win-2008-x86_64',
798
+ },
1331
799
  },
1332
800
  'windows2008r2-64' => {
1333
801
  :general => {
1334
802
  'platform' => 'windows-2008r2-64',
1335
803
  'packaging_platform' => 'windows-2012-x64',
1336
- 'ruby_arch' => 'x64'
804
+ 'ruby_arch' => 'x64',
1337
805
  },
1338
806
  :vmpooler => {
1339
- 'template' => 'win-2008r2-x86_64'
1340
- }
807
+ 'template' => 'win-2008r2-x86_64',
808
+ },
1341
809
  },
1342
810
  'windows2008r2-6432' => {
1343
811
  :general => {
1344
812
  'platform' => 'windows-2008r2-64',
1345
813
  'packaging_platform' => 'windows-2012-x64',
1346
- 'ruby_arch' => 'x86'
814
+ 'ruby_arch' => 'x86',
1347
815
  },
1348
816
  :vmpooler => {
1349
- 'template' => 'win-2008r2-x86_64'
1350
- }
817
+ 'template' => 'win-2008r2-x86_64',
818
+ },
1351
819
  },
1352
820
  'windows2012-64' => {
1353
821
  :general => {
1354
822
  'platform' => 'windows-2012-64',
1355
823
  'packaging_platform' => 'windows-2012-x64',
1356
- 'ruby_arch' => 'x64'
824
+ 'ruby_arch' => 'x64',
1357
825
  },
1358
826
  :vmpooler => {
1359
- 'template' => 'win-2012-x86_64'
1360
- }
827
+ 'template' => 'win-2012-x86_64',
828
+ },
1361
829
  },
1362
830
  'windows2012-6432' => {
1363
831
  :general => {
1364
832
  'platform' => 'windows-2012-64',
1365
833
  'packaging_platform' => 'windows-2012-x64',
1366
- 'ruby_arch' => 'x86'
834
+ 'ruby_arch' => 'x86',
1367
835
  },
1368
836
  :vmpooler => {
1369
- 'template' => 'win-2012-x86_64'
1370
- }
837
+ 'template' => 'win-2012-x86_64',
838
+ },
1371
839
  },
1372
840
  'windows2012r2-64' => {
1373
841
  :general => {
1374
842
  'platform' => 'windows-2012r2-64',
1375
843
  'packaging_platform' => 'windows-2012-x64',
1376
- 'ruby_arch' => 'x64'
844
+ 'ruby_arch' => 'x64',
1377
845
  },
1378
846
  :vmpooler => {
1379
- 'template' => 'win-2012r2-x86_64'
1380
- }
847
+ 'template' => 'win-2012r2-x86_64',
848
+ },
1381
849
  },
1382
850
  'windowsfips2012r2-64' => {
1383
851
  :general => {
1384
852
  'platform' => 'windows-2012r2-64',
1385
853
  'packaging_platform' => 'windowsfips-2012-x64',
1386
- 'ruby_arch' => 'x64'
854
+ 'ruby_arch' => 'x64',
1387
855
  },
1388
856
  :vmpooler => {
1389
- 'template' => 'win-2012r2-fips-x86_64'
1390
- }
857
+ 'template' => 'win-2012r2-fips-x86_64',
858
+ },
1391
859
  },
1392
860
  'windowsfips2012r2-6432' => {
1393
861
  :general => {
1394
862
  'platform' => 'windows-2012r2-64',
1395
863
  'packaging_platform' => 'windowsfips-2012-x64',
1396
- 'ruby_arch' => 'x64'
864
+ 'ruby_arch' => 'x64',
1397
865
  },
1398
866
  :vmpooler => {
1399
- 'template' => 'win-2012r2-fips-x86_64'
1400
- }
867
+ 'template' => 'win-2012r2-fips-x86_64',
868
+ },
1401
869
  },
1402
870
  'windows2012r2-6432' => {
1403
871
  :general => {
1404
872
  'platform' => 'windows-2012r2-64',
1405
873
  'packaging_platform' => 'windows-2012-x64',
1406
- 'ruby_arch' => 'x86'
874
+ 'ruby_arch' => 'x86',
1407
875
  },
1408
876
  :vmpooler => {
1409
- 'template' => 'win-2012r2-x86_64'
1410
- }
877
+ 'template' => 'win-2012r2-x86_64',
878
+ },
1411
879
  },
1412
880
  'windows2012r2_wmf5-64' => {
1413
881
  :general => {
1414
882
  'platform' => 'windows-2012r2-64',
1415
883
  'packaging_platform' => 'windows-2012-x64',
1416
- 'ruby_arch' => 'x64'
884
+ 'ruby_arch' => 'x64',
1417
885
  },
1418
886
  :vmpooler => {
1419
- 'template' => 'win-2012r2-wmf5-x86_64'
1420
- }
887
+ 'template' => 'win-2012r2-wmf5-x86_64',
888
+ },
1421
889
  },
1422
890
  'windows2012r2_ja-64' => {
1423
891
  :general => {
1424
892
  'platform' => 'windows-2012r2-64',
1425
893
  'packaging_platform' => 'windows-2012-x64',
1426
- 'ruby_arch' => 'x64'
894
+ 'ruby_arch' => 'x64',
1427
895
  },
1428
896
  :vmpooler => {
1429
897
  'template' => 'win-2012r2-ja-x86_64',
1430
- 'locale' => 'ja'
1431
- }
898
+ 'locale' => 'ja',
899
+ },
1432
900
  },
1433
901
  'windows2012r2_ja-6432' => {
1434
902
  :general => {
1435
903
  'platform' => 'windows-2012r2-64',
1436
904
  'packaging_platform' => 'windows-2012-x64',
1437
- 'ruby_arch' => 'x86'
905
+ 'ruby_arch' => 'x86',
1438
906
  },
1439
907
  :vmpooler => {
1440
908
  'template' => 'win-2012r2-ja-x86_64',
1441
- 'locale' => 'ja'
1442
- }
909
+ 'locale' => 'ja',
910
+ },
1443
911
  },
1444
912
  'windows2012r2_fr-64' => {
1445
913
  :general => {
1446
914
  'platform' => 'windows-2012r2-64',
1447
915
  'packaging_platform' => 'windows-2012-x64',
1448
- 'ruby_arch' => 'x64'
916
+ 'ruby_arch' => 'x64',
1449
917
  },
1450
918
  :vmpooler => {
1451
919
  'template' => 'win-2012r2-fr-x86_64',
1452
920
  'user' => 'Administrateur',
1453
- 'locale' => 'fr'
1454
- }
921
+ 'locale' => 'fr',
922
+ },
1455
923
  },
1456
924
  'windows2012r2_fr-6432' => {
1457
925
  :general => {
1458
926
  'platform' => 'windows-2012r2-64',
1459
927
  'packaging_platform' => 'windows-2012-x64',
1460
- 'ruby_arch' => 'x86'
928
+ 'ruby_arch' => 'x86',
1461
929
  },
1462
930
  :vmpooler => {
1463
931
  'template' => 'win-2012r2-fr-x86_64',
1464
932
  'user' => 'Administrateur',
1465
- 'locale' => 'fr'
1466
- }
933
+ 'locale' => 'fr',
934
+ },
1467
935
  },
1468
936
  'windows2012r2_core-64' => {
1469
937
  :general => {
1470
938
  'platform' => 'windows-2012r2-64',
1471
939
  'packaging_platform' => 'windows-2012-x64',
1472
- 'ruby_arch' => 'x64'
940
+ 'ruby_arch' => 'x64',
1473
941
  },
1474
942
  :vmpooler => {
1475
- 'template' => 'win-2012r2-core-x86_64'
1476
- }
943
+ 'template' => 'win-2012r2-core-x86_64',
944
+ },
1477
945
  },
1478
946
  'windows2012r2_core-6432' => {
1479
947
  :general => {
1480
948
  'platform' => 'windows-2012r2-64',
1481
949
  'packaging_platform' => 'windows-2012-x64',
1482
- 'ruby_arch' => 'x86'
950
+ 'ruby_arch' => 'x86',
1483
951
  },
1484
952
  :vmpooler => {
1485
- 'template' => 'win-2012r2-core-x86_64'
1486
- }
953
+ 'template' => 'win-2012r2-core-x86_64',
954
+ },
1487
955
  },
1488
956
  'windows2016-64' => {
1489
957
  :general => {
1490
958
  'platform' => 'windows-2016-64',
1491
959
  'packaging_platform' => 'windows-2012-x64',
1492
- 'ruby_arch' => 'x64'
960
+ 'ruby_arch' => 'x64',
1493
961
  },
1494
962
  :vmpooler => {
1495
- 'template' => 'win-2016-x86_64'
1496
- }
963
+ 'template' => 'win-2016-x86_64',
964
+ },
1497
965
  },
1498
966
  'windows2016-6432' => {
1499
967
  :general => {
1500
968
  'platform' => 'windows-2016-64',
1501
969
  'packaging_platform' => 'windows-2012-x64',
1502
- 'ruby_arch' => 'x86'
970
+ 'ruby_arch' => 'x86',
1503
971
  },
1504
972
  :vmpooler => {
1505
- 'template' => 'win-2016-x86_64'
1506
- }
973
+ 'template' => 'win-2016-x86_64',
974
+ },
1507
975
  },
1508
976
  'windows2016_core-64' => {
1509
977
  :general => {
1510
978
  'platform' => 'windows-2016-64',
1511
979
  'packaging_platform' => 'windows-2012-x64',
1512
- 'ruby_arch' => 'x64'
980
+ 'ruby_arch' => 'x64',
1513
981
  },
1514
982
  :vmpooler => {
1515
- 'template' => 'win-2016-core-x86_64'
1516
- }
983
+ 'template' => 'win-2016-core-x86_64',
984
+ },
1517
985
  },
1518
986
  'windows2016_core-6432' => {
1519
987
  :general => {
1520
988
  'platform' => 'windows-2016-64',
1521
989
  'packaging_platform' => 'windows-2012-x64',
1522
- 'ruby_arch' => 'x86'
990
+ 'ruby_arch' => 'x86',
1523
991
  },
1524
992
  :vmpooler => {
1525
- 'template' => 'win-2016-core-x86_64'
1526
- }
993
+ 'template' => 'win-2016-core-x86_64',
994
+ },
1527
995
  },
1528
996
  'windows2016_fr-64' => {
1529
997
  :general => {
1530
998
  'platform' => 'windows-2016-64',
1531
999
  'packaging_platform' => 'windows-2012-x64',
1532
- 'ruby_arch' => 'x64'
1000
+ 'ruby_arch' => 'x64',
1533
1001
  },
1534
1002
  :vmpooler => {
1535
1003
  'template' => 'win-2016-fr-x86_64',
1536
1004
  'user' => 'Administrateur',
1537
- 'locale' => 'fr'
1538
- }
1005
+ 'locale' => 'fr',
1006
+ },
1539
1007
  },
1540
1008
  'windows2016_fr-6432' => {
1541
1009
  :general => {
1542
1010
  'platform' => 'windows-2016-64',
1543
1011
  'packaging_platform' => 'windows-2012-x64',
1544
- 'ruby_arch' => 'x86'
1012
+ 'ruby_arch' => 'x86',
1545
1013
  },
1546
1014
  :vmpooler => {
1547
1015
  'template' => 'win-2016-fr-x86_64',
1548
1016
  'user' => 'Administrateur',
1549
- 'locale' => 'fr'
1550
- }
1017
+ 'locale' => 'fr',
1018
+ },
1551
1019
  },
1552
1020
  'windows2019-64' => {
1553
1021
  :general => {
1554
1022
  'platform' => 'windows-2019-64',
1555
1023
  'packaging_platform' => 'windows-2012-x64',
1556
- 'ruby_arch' => 'x64'
1024
+ 'ruby_arch' => 'x64',
1557
1025
  },
1558
1026
  :vmpooler => {
1559
- 'template' => 'win-2019-x86_64'
1560
- }
1027
+ 'template' => 'win-2019-x86_64',
1028
+ },
1561
1029
  },
1562
1030
  'windows2019-6432' => {
1563
1031
  :general => {
1564
1032
  'platform' => 'windows-2019-64',
1565
1033
  'packaging_platform' => 'windows-2012-x64',
1566
- 'ruby_arch' => 'x86'
1034
+ 'ruby_arch' => 'x86',
1567
1035
  },
1568
1036
  :vmpooler => {
1569
- 'template' => 'win-2019-x86_64'
1570
- }
1037
+ 'template' => 'win-2019-x86_64',
1038
+ },
1571
1039
  },
1572
1040
  'windows2019_ja-64' => {
1573
1041
  :general => {
1574
1042
  'platform' => 'windows-2019-64',
1575
1043
  'packaging_platform' => 'windows-2012-x64',
1576
- 'ruby_arch' => 'x64'
1044
+ 'ruby_arch' => 'x64',
1577
1045
  },
1578
1046
  :vmpooler => {
1579
1047
  'template' => 'win-2019-ja-x86_64',
1580
- 'locale' => 'ja'
1581
- }
1048
+ 'locale' => 'ja',
1049
+ },
1582
1050
  },
1583
1051
  'windows2019_ja-6432' => {
1584
1052
  :general => {
1585
1053
  'platform' => 'windows-2019-64',
1586
1054
  'packaging_platform' => 'windows-2012-x64',
1587
- 'ruby_arch' => 'x86'
1055
+ 'ruby_arch' => 'x86',
1588
1056
  },
1589
1057
  :vmpooler => {
1590
1058
  'template' => 'win-2019-ja-x86_64',
1591
- 'locale' => 'ja'
1592
- }
1059
+ 'locale' => 'ja',
1060
+ },
1593
1061
  },
1594
1062
  'windows2019_fr-64' => {
1595
1063
  :general => {
1596
1064
  'platform' => 'windows-2019-64',
1597
1065
  'packaging_platform' => 'windows-2012-x64',
1598
- 'ruby_arch' => 'x64'
1066
+ 'ruby_arch' => 'x64',
1599
1067
  },
1600
1068
  :vmpooler => {
1601
1069
  'template' => 'win-2019-fr-x86_64',
1602
1070
  'user' => 'Administrateur',
1603
- 'locale' => 'fr'
1604
- }
1071
+ 'locale' => 'fr',
1072
+ },
1605
1073
  },
1606
1074
  'windows2019_fr-6432' => {
1607
1075
  :general => {
1608
1076
  'platform' => 'windows-2019-64',
1609
1077
  'packaging_platform' => 'windows-2012-x64',
1610
- 'ruby_arch' => 'x86'
1078
+ 'ruby_arch' => 'x86',
1611
1079
  },
1612
1080
  :vmpooler => {
1613
1081
  'template' => 'win-2019-fr-x86_64',
1614
1082
  'user' => 'Administrateur',
1615
- 'locale' => 'fr'
1616
- }
1083
+ 'locale' => 'fr',
1084
+ },
1617
1085
  },
1618
1086
  'windows2019_core-64' => {
1619
1087
  :general => {
1620
1088
  'platform' => 'windows-2019-64',
1621
1089
  'packaging_platform' => 'windows-2012-x64',
1622
- 'ruby_arch' => 'x64'
1090
+ 'ruby_arch' => 'x64',
1623
1091
  },
1624
1092
  :vmpooler => {
1625
- 'template' => 'win-2019-core-x86_64'
1626
- }
1093
+ 'template' => 'win-2019-core-x86_64',
1094
+ },
1627
1095
  },
1628
1096
  'windows2019_core-6432' => {
1629
1097
  :general => {
1630
1098
  'platform' => 'windows-2019-64',
1631
1099
  'packaging_platform' => 'windows-2012-x64',
1632
- 'ruby_arch' => 'x86'
1100
+ 'ruby_arch' => 'x86',
1633
1101
  },
1634
1102
  :vmpooler => {
1635
- 'template' => 'win-2019-core-x86_64'
1636
- }
1103
+ 'template' => 'win-2019-core-x86_64',
1104
+ },
1637
1105
  },
1638
1106
  'windows2022-64' => {
1639
1107
  :general => {
1640
1108
  'platform' => 'windows-2022-64',
1641
1109
  'packaging_platform' => 'windows-2012-x64',
1642
- 'ruby_arch' => 'x64'
1643
- },
1644
- :vmpooler => {
1645
- 'template' => 'win-2022-x86_64'
1646
- }
1647
- },
1648
- 'windows7-64' => {
1649
- :general => {
1650
- 'platform' => 'windows-7-64',
1651
- 'packaging_platform' => 'windows-2012-x64',
1652
- 'ruby_arch' => 'x64'
1110
+ 'ruby_arch' => 'x64',
1653
1111
  },
1654
1112
  :vmpooler => {
1655
- 'template' => 'win-7-x86_64'
1656
- }
1657
- },
1658
- 'windows81-64' => {
1659
- :general => {
1660
- 'platform' => 'windows-8.1-64',
1661
- 'packaging_platform' => 'windows-2012-x64',
1662
- 'ruby_arch' => 'x64'
1113
+ 'template' => 'win-2022-x86_64',
1663
1114
  },
1664
- :vmpooler => {
1665
- 'template' => 'win-81-x86_64'
1666
- }
1667
1115
  },
1668
1116
  'windows10ent-32' => {
1669
1117
  :general => {
1670
1118
  'platform' => 'windows-10ent-32',
1671
1119
  'packaging_platform' => 'windows-2012-x86',
1672
- 'ruby_arch' => 'x86'
1120
+ 'ruby_arch' => 'x86',
1673
1121
  },
1674
1122
  :vmpooler => {
1675
- 'template' => 'win-10-ent-i386'
1676
- }
1123
+ 'template' => 'win-10-ent-i386',
1124
+ },
1677
1125
  },
1678
1126
  'windows10ent-64' => {
1679
1127
  :general => {
1680
1128
  'platform' => 'windows-10ent-64',
1681
1129
  'packaging_platform' => 'windows-2012-x64',
1682
- 'ruby_arch' => 'x64'
1130
+ 'ruby_arch' => 'x64',
1683
1131
  },
1684
1132
  :vmpooler => {
1685
- 'template' => 'win-10-ent-x86_64'
1686
- }
1133
+ 'template' => 'win-10-ent-x86_64',
1134
+ },
1687
1135
  },
1688
1136
  'windows10next-32' => {
1689
1137
  :general => {
1690
1138
  'platform' => 'windows-10ent-32',
1691
1139
  'packaging_platform' => 'windows-2012-x86',
1692
- 'ruby_arch' => 'x86'
1140
+ 'ruby_arch' => 'x86',
1693
1141
  },
1694
1142
  :vmpooler => {
1695
- 'template' => 'win-10-next-i386'
1696
- }
1143
+ 'template' => 'win-10-next-i386',
1144
+ },
1697
1145
  },
1698
1146
  'windows10next-64' => {
1699
1147
  :general => {
1700
1148
  'platform' => 'windows-10ent-64',
1701
1149
  'packaging_platform' => 'windows-2012-x64',
1702
- 'ruby_arch' => 'x64'
1150
+ 'ruby_arch' => 'x64',
1703
1151
  },
1704
1152
  :vmpooler => {
1705
- 'template' => 'win-10-next-x86_64'
1706
- }
1153
+ 'template' => 'win-10-next-x86_64',
1154
+ },
1707
1155
  },
1708
1156
  'windows10pro-64' => {
1709
1157
  :general => {
1710
1158
  'platform' => 'windows-10pro-64',
1711
1159
  'packaging_platform' => 'windows-2012-x64',
1712
- 'ruby_arch' => 'x64'
1160
+ 'ruby_arch' => 'x64',
1713
1161
  },
1714
1162
  :vmpooler => {
1715
- 'template' => 'win-10-pro-x86_64'
1716
- }
1163
+ 'template' => 'win-10-pro-x86_64',
1164
+ },
1717
1165
  },
1718
1166
  'windows10_1511-64' => {
1719
1167
  :general => {
1720
1168
  'platform' => 'windows-10ent-64',
1721
1169
  'packaging_platform' => 'windows-2012-x64',
1722
- 'ruby_arch' => 'x64'
1170
+ 'ruby_arch' => 'x64',
1723
1171
  },
1724
1172
  :vmpooler => {
1725
- 'template' => 'win-10-1511-x86_64'
1726
- }
1173
+ 'template' => 'win-10-1511-x86_64',
1174
+ },
1727
1175
  },
1728
1176
  'windows10_1607-64' => {
1729
1177
  :general => {
1730
1178
  'platform' => 'windows-10ent-64',
1731
1179
  'packaging_platform' => 'windows-2012-x64',
1732
- 'ruby_arch' => 'x64'
1180
+ 'ruby_arch' => 'x64',
1733
1181
  },
1734
1182
  :vmpooler => {
1735
- 'template' => 'win-10-1607-x86_64'
1736
- }
1183
+ 'template' => 'win-10-1607-x86_64',
1184
+ },
1737
1185
  },
1738
1186
  'windows10_1809-64' => {
1739
1187
  :general => {
1740
1188
  'platform' => 'windows-10ent-64',
1741
1189
  'packaging_platform' => 'windows-2012-x64',
1742
- 'ruby_arch' => 'x64'
1190
+ 'ruby_arch' => 'x64',
1743
1191
  },
1744
1192
  :vmpooler => {
1745
- 'template' => 'win-10-1809-x86_64'
1746
- }
1193
+ 'template' => 'win-10-1809-x86_64',
1194
+ },
1747
1195
  },
1748
1196
  'windows11ent-64' => {
1749
1197
  :general => {
1750
1198
  'platform' => 'windows-11ent-64',
1751
1199
  'packaging_platform' => 'windows-2012-x64',
1752
- 'ruby_arch' => 'x64'
1200
+ 'ruby_arch' => 'x64',
1753
1201
  },
1754
1202
  :vmpooler => {
1755
- 'template' => 'win-11-ent-x86_64'
1756
- }
1757
- }
1203
+ 'template' => 'win-11-ent-x86_64',
1204
+ },
1205
+ },
1758
1206
  })
1759
1207
 
1760
1208
  result['archlinux-64'] = result['archlinuxrolling-64']
@@ -1763,62 +1211,14 @@ module BeakerHostGenerator
1763
1211
 
1764
1212
  def osinfo_bhgv1
1765
1213
  {
1766
- 'centos4-32' => {
1767
- :general => {
1768
- 'platform' => 'centos-4-i386'
1769
- },
1770
- :vmpooler => {
1771
- 'template' => 'centos-4-i386'
1772
- }
1773
- },
1774
- 'centos4-64' => {
1775
- :general => {
1776
- 'platform' => 'centos-4-x86_64'
1777
- },
1778
- :vmpooler => {
1779
- 'template' => 'centos-4-x86_64'
1780
- }
1781
- },
1782
- 'centos5-32' => {
1783
- :general => {
1784
- 'platform' => 'centos-5-i386'
1785
- },
1786
- :vmpooler => {
1787
- 'template' => 'centos-5-i386'
1788
- }
1789
- },
1790
- 'centos5-64' => {
1791
- :general => {
1792
- 'platform' => 'centos-5-x86_64'
1793
- },
1794
- :vmpooler => {
1795
- 'template' => 'centos-5-x86_64'
1796
- }
1797
- },
1798
- 'centos6-32' => {
1214
+ 'centos7-64' => {
1799
1215
  :general => {
1800
- 'platform' => 'centos-6-i386'
1216
+ 'platform' => 'centos-7-x86_64',
1801
1217
  },
1802
1218
  :vmpooler => {
1803
- 'template' => 'centos-6-i386'
1804
- }
1805
- },
1806
- 'centos6-64' => {
1807
- :general => {
1808
- 'platform' => 'centos-6-x86_64'
1219
+ 'template' => 'centos-7-x86_64',
1809
1220
  },
1810
- :vmpooler => {
1811
- 'template' => 'centos-6-x86_64'
1812
- }
1813
1221
  },
1814
- 'centos7-64' => {
1815
- :general => {
1816
- 'platform' => 'centos-7-x86_64'
1817
- },
1818
- :vmpooler => {
1819
- 'template' => 'centos-7-x86_64'
1820
- }
1821
- }
1822
1222
  }
1823
1223
  end
1824
1224
 
@@ -1867,34 +1267,22 @@ module BeakerHostGenerator
1867
1267
  # @example Getting CentOS 6 64-bit information for the VMPooler hypervisor
1868
1268
  # Given the OS info map looks like:
1869
1269
  # ...
1870
- # 'centos6-64' => {
1871
- # :general => { 'platform' => 'el-6-x86_64' },
1872
- # :vmpooler => { 'template' => 'centos-6-x86_64' }
1270
+ # 'centos9-64' => {
1271
+ # :general => { 'platform' => 'el-9-x86_64' },
1272
+ # :vmpooler => { 'template' => 'centos-9-x86_64' }
1873
1273
  # }
1874
1274
  # ...
1875
1275
  #
1876
- # Then get_platform_info(0, 'centos6-64', :vmpooler) returns:
1276
+ # Then get_platform_info(0, 'centos9-64', :vmpooler) returns:
1877
1277
  # {
1878
1278
  # 'platform' => 'el-6-x86_64',
1879
1279
  # 'template' => 'centos-6-x86_64'
1880
1280
  # }
1881
1281
  def get_platform_info(bhg_version, platform, hypervisor)
1882
1282
  info = get_osinfo(bhg_version)[platform]
1883
- {}.deeper_merge!(info[:general]).deeper_merge!(info[hypervisor])
1884
- end
1283
+ return {} unless info
1885
1284
 
1886
- # Perform any adjustments or modifications necessary to the given node
1887
- # configuration map, taking things like platform and PE version into
1888
- # account.
1889
- #
1890
- # This is intended to capture any oddities that are necessary for a node
1891
- # to be used in a particular context.
1892
- def fixup_node(cfg)
1893
- # PE 2.8 doesn't exist for EL 4. We use 2.0 instead.
1894
- if cfg['platform'] =~ /el-4/ and pe_version =~ /2\.8/
1895
- cfg['pe_ver'] = "2.0.3"
1896
- end
1285
+ {}.deeper_merge!(info[:general]).deeper_merge!(info[hypervisor])
1897
1286
  end
1898
-
1899
1287
  end
1900
1288
  end