Skip to content

Commit

Permalink
Merge pull request #357 from h0tw1r3/add-ubuntu-noble-platform
Browse files Browse the repository at this point in the history
Add Ubuntu 24.04 support
  • Loading branch information
bastelfreak authored Feb 13, 2024
2 parents 6ecd07e + b19617b commit f345de7
Show file tree
Hide file tree
Showing 16 changed files with 300 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lib/beaker-hostgenerator/data.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1097,7 +1097,7 @@ def generate_osinfo
# Ubuntu
#
# Generate LTS platforms
(18..22).select(&:even?).each do |release|
(18..24).select(&:even?).each do |release|
yield ["ubuntu#{release}04-64", "ubuntu-#{release}.04-amd64"]

yield ["ubuntu#{release}04-POWER", "ubuntu-#{release}.04-ppc64el"]
Expand Down
15 changes: 15 additions & 0 deletions test/fixtures/generated/default/ubuntu2404-64c
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
arguments_string: ubuntu2404-64c
environment_variables: {}
expected_hash:
HOSTS:
ubuntu2404-64-1:
platform: ubuntu-24.04-amd64
hypervisor: vmpooler
template: ubuntu-2404-x86_64
roles:
- agent
- dashboard
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
14 changes: 14 additions & 0 deletions test/fixtures/generated/default/ubuntu2404-AARCH64f
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
arguments_string: ubuntu2404-AARCH64f
environment_variables: {}
expected_hash:
HOSTS:
ubuntu2404-AARCH64-1:
platform: ubuntu-24.04-aarch64
hypervisor: vmpooler
roles:
- agent
- frictionless
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
14 changes: 14 additions & 0 deletions test/fixtures/generated/default/ubuntu2404-POWERd
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
arguments_string: ubuntu2404-POWERd
environment_variables: {}
expected_hash:
HOSTS:
ubuntu2404-POWER-1:
platform: ubuntu-24.04-ppc64el
hypervisor: vmpooler
roles:
- agent
- database
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,28 @@
---
arguments_string: ubuntu2404-64c-vro73-64-ubuntu2404-64d
environment_variables: {}
expected_hash:
HOSTS:
ubuntu2404-64-1:
platform: ubuntu-24.04-amd64
hypervisor: vmpooler
template: ubuntu-2404-x86_64
roles:
- agent
- dashboard
vro73-64-1:
platform: sles-11-x86_64
template: vro-73-x86_64
hypervisor: vmpooler
roles:
- agent
ubuntu2404-64-2:
platform: ubuntu-24.04-amd64
hypervisor: vmpooler
template: ubuntu-2404-x86_64
roles:
- agent
- database
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,26 @@
---
arguments_string: ubuntu2404-AARCH64f-vro7-64-ubuntu2404-AARCH64l
environment_variables: {}
expected_hash:
HOSTS:
ubuntu2404-AARCH64-1:
platform: ubuntu-24.04-aarch64
hypervisor: vmpooler
roles:
- agent
- frictionless
vro7-64-1:
platform: sles-11-x86_64
template: vro-7-x86_64
hypervisor: vmpooler
roles:
- agent
ubuntu2404-AARCH64-2:
platform: ubuntu-24.04-aarch64
hypervisor: vmpooler
roles:
- agent
- classifier
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,26 @@
---
arguments_string: ubuntu2404-POWERd-vro71-64-ubuntu2404-POWERc
environment_variables: {}
expected_hash:
HOSTS:
ubuntu2404-POWER-1:
platform: ubuntu-24.04-ppc64el
hypervisor: vmpooler
roles:
- agent
- database
vro71-64-1:
platform: sles-11-x86_64
template: vro-71-x86_64
hypervisor: vmpooler
roles:
- agent
ubuntu2404-POWER-2:
platform: ubuntu-24.04-ppc64el
hypervisor: vmpooler
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,31 @@
---
arguments_string: vro7-64aulcdfm-ubuntu2404-AARCH64-vro7-64a
environment_variables: {}
expected_hash:
HOSTS:
vro7-64-1:
platform: sles-11-x86_64
template: vro-7-x86_64
hypervisor: vmpooler
roles:
- agent
- ca
- classifier
- dashboard
- database
- frictionless
- master
ubuntu2404-AARCH64-1:
platform: ubuntu-24.04-aarch64
hypervisor: vmpooler
roles:
- agent
vro7-64-2:
platform: sles-11-x86_64
template: vro-7-x86_64
hypervisor: vmpooler
roles:
- agent
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,31 @@
---
arguments_string: vro71-64a-ubuntu2404-POWER-vro71-64aulcdfm
environment_variables: {}
expected_hash:
HOSTS:
vro71-64-1:
platform: sles-11-x86_64
template: vro-71-x86_64
hypervisor: vmpooler
roles:
- agent
ubuntu2404-POWER-1:
platform: ubuntu-24.04-ppc64el
hypervisor: vmpooler
roles:
- agent
vro71-64-2:
platform: sles-11-x86_64
template: vro-71-x86_64
hypervisor: vmpooler
roles:
- agent
- ca
- classifier
- dashboard
- database
- frictionless
- master
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,28 @@
---
arguments_string: vro73-64u-ubuntu2404-64-vro73-64m
environment_variables: {}
expected_hash:
HOSTS:
vro73-64-1:
platform: sles-11-x86_64
template: vro-73-x86_64
hypervisor: vmpooler
roles:
- agent
- ca
ubuntu2404-64-1:
platform: ubuntu-24.04-amd64
hypervisor: vmpooler
template: ubuntu-2404-x86_64
roles:
- agent
vro73-64-2:
platform: sles-11-x86_64
template: vro-73-x86_64
hypervisor: vmpooler
roles:
- agent
- master
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
15 changes: 15 additions & 0 deletions test/fixtures/generated/osinfo-version-0/ubuntu2404-64c
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
arguments_string: "--osinfo-version 0 ubuntu2404-64c"
environment_variables: {}
expected_hash:
HOSTS:
ubuntu2404-64-1:
platform: ubuntu-24.04-amd64
hypervisor: vmpooler
template: ubuntu-2404-x86_64
roles:
- agent
- dashboard
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
14 changes: 14 additions & 0 deletions test/fixtures/generated/osinfo-version-0/ubuntu2404-AARCH64f
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
arguments_string: "--osinfo-version 0 ubuntu2404-AARCH64f"
environment_variables: {}
expected_hash:
HOSTS:
ubuntu2404-AARCH64-1:
platform: ubuntu-24.04-aarch64
hypervisor: vmpooler
roles:
- agent
- frictionless
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
14 changes: 14 additions & 0 deletions test/fixtures/generated/osinfo-version-0/ubuntu2404-POWERd
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
arguments_string: "--osinfo-version 0 ubuntu2404-POWERd"
environment_variables: {}
expected_hash:
HOSTS:
ubuntu2404-POWER-1:
platform: ubuntu-24.04-ppc64el
hypervisor: vmpooler
roles:
- agent
- database
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
15 changes: 15 additions & 0 deletions test/fixtures/generated/osinfo-version-1/ubuntu2404-64c
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
arguments_string: "--osinfo-version 1 ubuntu2404-64c"
environment_variables: {}
expected_hash:
HOSTS:
ubuntu2404-64-1:
platform: ubuntu-24.04-amd64
hypervisor: vmpooler
template: ubuntu-2404-x86_64
roles:
- agent
- dashboard
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
14 changes: 14 additions & 0 deletions test/fixtures/generated/osinfo-version-1/ubuntu2404-AARCH64f
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
arguments_string: "--osinfo-version 1 ubuntu2404-AARCH64f"
environment_variables: {}
expected_hash:
HOSTS:
ubuntu2404-AARCH64-1:
platform: ubuntu-24.04-aarch64
hypervisor: vmpooler
roles:
- agent
- frictionless
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
14 changes: 14 additions & 0 deletions test/fixtures/generated/osinfo-version-1/ubuntu2404-POWERd
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
arguments_string: "--osinfo-version 1 ubuntu2404-POWERd"
environment_variables: {}
expected_hash:
HOSTS:
ubuntu2404-POWER-1:
platform: ubuntu-24.04-ppc64el
hypervisor: vmpooler
roles:
- agent
- database
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:

0 comments on commit f345de7

Please sign in to comment.