Skip to content

Commit

Permalink
Merge pull request #390 from skyamgarp/windowsfips2016-support
Browse files Browse the repository at this point in the history
Add support for windowsfips 2016 x64
  • Loading branch information
kenyon authored Nov 27, 2024
2 parents 76ffa07 + 1c1b7c2 commit ffba51f
Show file tree
Hide file tree
Showing 6 changed files with 123 additions and 0 deletions.
10 changes: 10 additions & 0 deletions lib/beaker-hostgenerator/data.rb
Original file line number Diff line number Diff line change
Expand Up @@ -866,6 +866,16 @@ def osinfo
'locale' => 'fr',
},
},
'windowsfips2016-64' => {
general: {
'platform' => 'windows-2016-64',
'packaging_platform' => 'windowsfips-2016-x64',
'ruby_arch' => 'x64',
},
vmpooler: {
'template' => 'win-2016-fips-x86_64',
},
},
'windowsfips2016-6432' => {
general: {
'platform' => 'windows-2016-64',
Expand Down
17 changes: 17 additions & 0 deletions test/fixtures/generated/default/windowsfips2016-64u
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
arguments_string: windowsfips2016-64u
environment_variables: {}
expected_hash:
HOSTS:
windowsfips2016-64-1:
platform: windows-2016-64
packaging_platform: windowsfips-2016-x64
ruby_arch: x64
template: win-2016-fips-x86_64
hypervisor: vmpooler
roles:
- agent
- ca
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
arguments_string: fedora28-64d-windowsfips2016-64-fedora28-64c
environment_variables: {}
expected_hash:
HOSTS:
fedora28-64-1:
platform: fedora-28-x86_64
hypervisor: vmpooler
template: fedora-28-x86_64
roles:
- agent
- database
windowsfips2016-64-1:
platform: windows-2016-64
packaging_platform: windowsfips-2016-x64
ruby_arch: x64
template: win-2016-fips-x86_64
hypervisor: vmpooler
roles:
- agent
fedora28-64-2:
platform: fedora-28-x86_64
hypervisor: vmpooler
template: fedora-28-x86_64
roles:
- agent
- dashboard
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
arguments_string: windowsfips2016-64u-fedora28-64-windowsfips2016-64m
environment_variables: {}
expected_hash:
HOSTS:
windowsfips2016-64-1:
platform: windows-2016-64
packaging_platform: windowsfips-2016-x64
ruby_arch: x64
template: win-2016-fips-x86_64
hypervisor: vmpooler
roles:
- agent
- ca
fedora28-64-1:
platform: fedora-28-x86_64
hypervisor: vmpooler
template: fedora-28-x86_64
roles:
- agent
windowsfips2016-64-2:
platform: windows-2016-64
packaging_platform: windowsfips-2016-x64
ruby_arch: x64
template: win-2016-fips-x86_64
hypervisor: vmpooler
roles:
- agent
- master
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
17 changes: 17 additions & 0 deletions test/fixtures/generated/osinfo-version-0/windowsfips2016-64u
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
arguments_string: "--osinfo-version 0 windowsfips2016-64u"
environment_variables: {}
expected_hash:
HOSTS:
windowsfips2016-64-1:
platform: windows-2016-64
packaging_platform: windowsfips-2016-x64
ruby_arch: x64
template: win-2016-fips-x86_64
hypervisor: vmpooler
roles:
- agent
- ca
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
17 changes: 17 additions & 0 deletions test/fixtures/generated/osinfo-version-1/windowsfips2016-64u
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
arguments_string: "--osinfo-version 1 windowsfips2016-64u"
environment_variables: {}
expected_hash:
HOSTS:
windowsfips2016-64-1:
platform: windows-2016-64
packaging_platform: windowsfips-2016-x64
ruby_arch: x64
template: win-2016-fips-x86_64
hypervisor: vmpooler
roles:
- agent
- ca
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:

0 comments on commit ffba51f

Please sign in to comment.