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.

Sign up for GitHub

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-1302) Add Alma and Rocky 8 support #226

Merged
merged 2 commits into from
Sep 21, 2021
+1,311 −1,306
Merged

(IMAGES-1302) Add Alma and Rocky 8 support #226

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da2f8f1
(IMAGES-1302) Add Alma and Rocky support
GabrielNagy Sep 20, 2021
44d7506
(maint) Update and remove obsolete fixtures
GabrielNagy Sep 20, 2021
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
22 changes: 22 additions & 0 deletions lib/beaker-hostgenerator/data.rb
View file
Original file line number Diff line number Diff line change
@@ -186,6 +186,17 @@ def osinfo
'template' => 'aix-7.2-power'
}
},
'almalinux8-64' => {
:general => {
'platform' => 'el-8-x86_64',
},
:docker => {
'docker_image_commands' => [
'cp /bin/true /sbin/agetty',
'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
]
}
},
'amazon6-64' => {
:general => {
'platform' => 'el-6-x86_64',
@@ -1022,6 +1033,17 @@ def osinfo
'template' => 'redhat-8-power8'
}
},
'rocky8-64' => {
:general => {
'platform' => 'el-8-x86_64',
},
:docker => {
'docker_image_commands' => [
'cp /bin/true /sbin/agetty',
'yum install -y crontabs initscripts iproute openssl wget which glibc-langpack-en'
]
}
},
'scientific5-32' => {
:general => {
'platform' => 'el-5-i386',
8 changes: 4 additions & 4 deletions lib/beaker-hostgenerator/hypervisor/vmpooler.rb
View file
Original file line number Diff line number Diff line change
@@ -18,10 +18,10 @@ def generate_node(node_info, base_config, bhg_version)
base_config = base_generate_node(node_info, base_config, bhg_version, :vmpooler)

case node_info['ostype']
when /^centos/
base_config['template'] = base_config['platform'].gsub(/^el/, 'centos')
when /^(almalinux|centos|redhat|rocky)/
base_config['template'] ||= base_config['platform'].gsub(/^el/, $1)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated this logic to only modify the template key in case it's not defined in the base config. This seems like a sensible approach to me, allowing overrides on a case-by-case basis.

when /^fedora/
base_config['template'] = base_config['platform']
base_config['template'] ||= base_config['platform']
when /^ubuntu/
arch = case node_info['bits']
when '64'
@@ -32,7 +32,7 @@ def generate_node(node_info, base_config, bhg_version)
nil
end

base_config['template'] = "#{node_info['ostype'].sub('ubuntu', 'ubuntu-')}-#{arch}" if arch
base_config['template'] ||= "#{node_info['ostype'].sub('ubuntu', 'ubuntu-')}-#{arch}" if arch
end

# Some vmpooler/vsphere platforms have special requirements.
18 changes: 9 additions & 9 deletions ...fixtures/generated/default/redhat6-S390Xu → ...fixtures/generated/default/almalinux8-64u
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
---
arguments_string: redhat6-S390Xu
arguments_string: almalinux8-64u
environment_variables: {}
expected_hash:
HOSTS:
redhat6-S390X-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
almalinux8-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: el-8-x86_64
hypervisor: vmpooler
platform: el-6-s390x
packaging_platform: el-6-s390x
template: almalinux-8-x86_64
roles:
- agent
- ca
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
expected_exception:
12 changes: 6 additions & 6 deletions test/fixtures/generated/default/arista4-32d
View file
Original file line number Diff line number Diff line change
@@ -4,19 +4,19 @@ environment_variables: {}
expected_hash:
HOSTS:
arista4-32-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
hypervisor: vmpooler
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: eos-4-i386
packaging_platform: eos-4-i386
template: arista-4-i386
hypervisor: vmpooler
roles:
- agent
- database
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
expected_exception:
12 changes: 6 additions & 6 deletions test/fixtures/generated/default/centos4-32f
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@ environment_variables: {}
expected_hash:
HOSTS:
centos4-32-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
hypervisor: vmpooler
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: el-4-i386
hypervisor: vmpooler
template: centos-4-i386
roles:
- agent
@@ -18,4 +18,4 @@ expected_hash:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
expected_exception:
12 changes: 6 additions & 6 deletions test/fixtures/generated/default/centos4-64m
View file
Original file line number Diff line number Diff line change
@@ -4,12 +4,12 @@ environment_variables: {}
expected_hash:
HOSTS:
centos4-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
hypervisor: vmpooler
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: el-4-x86_64
hypervisor: vmpooler
template: centos-4-x86_64
roles:
- agent
@@ -18,4 +18,4 @@ expected_hash:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
expected_exception:
12 changes: 6 additions & 6 deletions test/fixtures/generated/default/centos5-32aulcdfm
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@ environment_variables: {}
expected_hash:
HOSTS:
centos5-32-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
hypervisor: vmpooler
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: el-5-i386
packaging_platform: el-5-i386
hypervisor: vmpooler
template: centos-5-i386
roles:
- agent
@@ -24,4 +24,4 @@ expected_hash:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
expected_exception:
12 changes: 6 additions & 6 deletions test/fixtures/generated/default/centos5-64a
View file
Original file line number Diff line number Diff line change
@@ -4,18 +4,18 @@ environment_variables: {}
expected_hash:
HOSTS:
centos5-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
hypervisor: vmpooler
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: el-5-x86_64
packaging_platform: el-5-x86_64
hypervisor: vmpooler
template: centos-5-x86_64
roles:
- agent
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
expected_exception:
12 changes: 6 additions & 6 deletions test/fixtures/generated/default/centos6-32u
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@ environment_variables: {}
expected_hash:
HOSTS:
centos6-32-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
hypervisor: vmpooler
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: el-6-i386
packaging_platform: el-6-i386
hypervisor: vmpooler
template: centos-6-i386
roles:
- agent
@@ -19,4 +19,4 @@ expected_hash:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
expected_exception:
12 changes: 6 additions & 6 deletions test/fixtures/generated/default/centos6-64l
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@ environment_variables: {}
expected_hash:
HOSTS:
centos6-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
hypervisor: vmpooler
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: el-6-x86_64
packaging_platform: el-6-x86_64
hypervisor: vmpooler
template: centos-6-x86_64
roles:
- agent
@@ -19,4 +19,4 @@ expected_hash:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
expected_exception:
12 changes: 6 additions & 6 deletions test/fixtures/generated/default/centos7-64c
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@ environment_variables: {}
expected_hash:
HOSTS:
centos7-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
hypervisor: vmpooler
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: el-7-x86_64
packaging_platform: el-7-x86_64
hypervisor: vmpooler
template: centos-7-x86_64
roles:
- agent
@@ -19,4 +19,4 @@ expected_hash:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
expected_exception:
12 changes: 6 additions & 6 deletions test/fixtures/generated/default/cumulus25-64m
View file
Original file line number Diff line number Diff line change
@@ -4,19 +4,19 @@ environment_variables: {}
expected_hash:
HOSTS:
cumulus25-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
hypervisor: vmpooler
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: cumulus-2.5-x86_64
packaging_platform: cumulus-2.2-amd64
template: cumulus-vx-25-x86_64
hypervisor: vmpooler
roles:
- agent
- master
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
expected_exception:
12 changes: 6 additions & 6 deletions test/fixtures/generated/default/debian6-32aulcdfm
View file
Original file line number Diff line number Diff line change
@@ -4,13 +4,13 @@ environment_variables: {}
expected_hash:
HOSTS:
debian6-32-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
hypervisor: vmpooler
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: debian-6-i386
template: debian-6-i386
hypervisor: vmpooler
roles:
- agent
- ca
@@ -23,4 +23,4 @@ expected_hash:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
expected_exception:
12 changes: 6 additions & 6 deletions test/fixtures/generated/default/debian6-64a
View file
Original file line number Diff line number Diff line change
@@ -4,17 +4,17 @@ environment_variables: {}
expected_hash:
HOSTS:
debian6-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
hypervisor: vmpooler
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: debian-6-amd64
template: debian-6-x86_64
hypervisor: vmpooler
roles:
- agent
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
expected_exception:
12 changes: 6 additions & 6 deletions test/fixtures/generated/default/debian7-32u
View file
Original file line number Diff line number Diff line change
@@ -4,19 +4,19 @@ environment_variables: {}
expected_hash:
HOSTS:
debian7-32-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
hypervisor: vmpooler
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
platform: debian-7-i386
packaging_platform: debian-7-i386
template: debian-7-i386
hypervisor: vmpooler
roles:
- agent
- ca
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/
expected_exception:
expected_exception:
Loading