Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(IMAGES-1195) Add support for Fedora 32 #185

Merged
merged 1 commit into from
Jun 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions lib/beaker-hostgenerator/data.rb
Original file line number Diff line number Diff line change
Expand Up @@ -772,6 +772,15 @@ def osinfo
'template' => 'fedora-31-x86_64'
}
},
'fedora32-64' => {
:general => {
'platform' => 'fedora-32-x86_64',
'packaging_platform' => 'fedora-32-x86_64'
},
:vmpooler => {
'template' => 'fedora-32-x86_64'
}
},
'huaweios6-POWER' => {
:general => {
'platform' => 'huaweios-6-powerpc'
Expand Down
21 changes: 21 additions & 0 deletions test/fixtures/generated/default/fedora32-64a
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
arguments_string: fedora32-64a
environment_variables: {}
expected_hash:
HOSTS:
fedora32-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: fedora-32-x86_64
packaging_platform: fedora-32-x86_64
template: fedora-32-x86_64
hypervisor: vmpooler
roles:
- agent
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
arguments_string: fedora32-64a-solaris114-64-fedora32-64aulcdfm
environment_variables: {}
expected_hash:
HOSTS:
fedora32-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: fedora-32-x86_64
packaging_platform: fedora-32-x86_64
template: fedora-32-x86_64
hypervisor: vmpooler
roles:
- agent
solaris114-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: solaris-11.4-i386
packaging_platform: solaris-11-i386
template: solaris-114-x86_64
hypervisor: vmpooler
roles:
- agent
fedora32-64-2:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: fedora-32-x86_64
packaging_platform: fedora-32-x86_64
template: fedora-32-x86_64
hypervisor: vmpooler
roles:
- agent
- ca
- classifier
- dashboard
- database
- frictionless
- master
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
---
arguments_string: solaris114-64aulcdfm-fedora32-64-solaris114-64a
environment_variables: {}
expected_hash:
HOSTS:
solaris114-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: solaris-11.4-i386
packaging_platform: solaris-11-i386
template: solaris-114-x86_64
hypervisor: vmpooler
roles:
- agent
- ca
- classifier
- dashboard
- database
- frictionless
- master
fedora32-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: fedora-32-x86_64
packaging_platform: fedora-32-x86_64
template: fedora-32-x86_64
hypervisor: vmpooler
roles:
- agent
solaris114-64-2:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: solaris-11.4-i386
packaging_platform: solaris-11-i386
template: solaris-114-x86_64
hypervisor: vmpooler
roles:
- agent
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
21 changes: 21 additions & 0 deletions test/fixtures/generated/osinfo-version-0/fedora32-64a
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
arguments_string: "--osinfo-version 0 fedora32-64a"
environment_variables: {}
expected_hash:
HOSTS:
fedora32-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: fedora-32-x86_64
packaging_platform: fedora-32-x86_64
template: fedora-32-x86_64
hypervisor: vmpooler
roles:
- agent
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
21 changes: 21 additions & 0 deletions test/fixtures/generated/osinfo-version-1/fedora32-64a
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
arguments_string: "--osinfo-version 1 fedora32-64a"
environment_variables: {}
expected_hash:
HOSTS:
fedora32-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: fedora-32-x86_64
packaging_platform: fedora-32-x86_64
template: fedora-32-x86_64
hypervisor: vmpooler
roles:
- agent
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception: