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-1116) Add beaker-hostgenerator support for Fedora 30 (amd64) #154

Merged
merged 1 commit into from
May 23, 2019
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 @@ -631,6 +631,15 @@ def osinfo
'template' => 'fedora-29-x86_64'
}
},
'fedora30-64' => {
:general => {
'platform' => 'fedora-30-x86_64',
'packaging_platform' => 'fedora-30-x86_64'
},
:vmpooler => {
'template' => 'fedora-30-x86_64'
}
},
'huaweios6-POWER' => {
:general => {
'platform' => 'huaweios-6-powerpc'
Expand Down
27 changes: 27 additions & 0 deletions test/fixtures/generated/default/fedora30-64aulcdfm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
arguments_string: fedora30-64aulcdfm
environment_variables: {}
expected_hash:
HOSTS:
fedora30-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: fedora-30-x86_64
packaging_platform: fedora-30-x86_64
template: fedora-30-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,48 @@
---
arguments_string: fedora30-64aulcdfm-ubuntu1204-64-fedora30-64a
environment_variables: {}
expected_hash:
HOSTS:
fedora30-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: fedora-30-x86_64
packaging_platform: fedora-30-x86_64
template: fedora-30-x86_64
hypervisor: vmpooler
roles:
- agent
- ca
- classifier
- dashboard
- database
- frictionless
- master
ubuntu1204-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: ubuntu-12.04-amd64
template: ubuntu-1204-x86_64
hypervisor: vmpooler
roles:
- agent
fedora30-64-2:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: fedora-30-x86_64
packaging_platform: fedora-30-x86_64
template: fedora-30-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,43 @@
---
arguments_string: ubuntu1204-64u-fedora30-64-ubuntu1204-64m
environment_variables: {}
expected_hash:
HOSTS:
ubuntu1204-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: ubuntu-12.04-amd64
template: ubuntu-1204-x86_64
hypervisor: vmpooler
roles:
- agent
- ca
fedora30-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: fedora-30-x86_64
packaging_platform: fedora-30-x86_64
template: fedora-30-x86_64
hypervisor: vmpooler
roles:
- agent
ubuntu1204-64-2:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: ubuntu-12.04-amd64
template: ubuntu-1204-x86_64
hypervisor: vmpooler
roles:
- agent
- master
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
27 changes: 27 additions & 0 deletions test/fixtures/generated/osinfo-version-0/fedora30-64aulcdfm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
arguments_string: "--osinfo-version 0 fedora30-64aulcdfm"
environment_variables: {}
expected_hash:
HOSTS:
fedora30-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: fedora-30-x86_64
packaging_platform: fedora-30-x86_64
template: fedora-30-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:
27 changes: 27 additions & 0 deletions test/fixtures/generated/osinfo-version-1/fedora30-64aulcdfm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
arguments_string: "--osinfo-version 1 fedora30-64aulcdfm"
environment_variables: {}
expected_hash:
HOSTS:
fedora30-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: fedora-30-x86_64
packaging_platform: fedora-30-x86_64
template: fedora-30-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: