Skip to content

Commit

Permalink
Merge pull request #335 from yachub/add-amazon-arm64
Browse files Browse the repository at this point in the history
Add amazon2023-AARCH64
  • Loading branch information
bastelfreak authored Sep 28, 2023
2 parents ea5b5d6 + 24c40d0 commit 013dab5
Show file tree
Hide file tree
Showing 6 changed files with 118 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/beaker-hostgenerator/data.rb
Original file line number Diff line number Diff line change
Expand Up @@ -1100,6 +1100,7 @@ def generate_osinfo

# Amazon Linux
yield %w[amazon2023-64 amazon-2023-x86_64]
yield %w[amazon2023-AARCH64 amazon-2023-arm64]

# AlmaLinux and Rocky
%w[almalinux rocky].each do |os|
Expand Down
19 changes: 19 additions & 0 deletions test/fixtures/generated/default/amazon2023-AARCH64aulcdfm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
arguments_string: amazon2023-AARCH64aulcdfm
environment_variables: {}
expected_hash:
HOSTS:
amazon2023-AARCH64-1:
platform: amazon-2023-arm64
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,31 @@
---
arguments_string: amazon2023-AARCH64aulcdfm-solaris114-64-amazon2023-AARCH64a
environment_variables: {}
expected_hash:
HOSTS:
amazon2023-AARCH64-1:
platform: amazon-2023-arm64
hypervisor: vmpooler
roles:
- agent
- ca
- classifier
- dashboard
- database
- frictionless
- master
solaris114-64-1:
platform: solaris-11.4-i386
packaging_platform: solaris-11-i386
template: solaris-114-x86_64
hypervisor: vmpooler
roles:
- agent
amazon2023-AARCH64-2:
platform: amazon-2023-arm64
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,29 @@
---
arguments_string: solaris114-64f-amazon2023-AARCH64-solaris114-64l
environment_variables: {}
expected_hash:
HOSTS:
solaris114-64-1:
platform: solaris-11.4-i386
packaging_platform: solaris-11-i386
template: solaris-114-x86_64
hypervisor: vmpooler
roles:
- agent
- frictionless
amazon2023-AARCH64-1:
platform: amazon-2023-arm64
hypervisor: vmpooler
roles:
- agent
solaris114-64-2:
platform: solaris-11.4-i386
packaging_platform: solaris-11-i386
template: solaris-114-x86_64
hypervisor: vmpooler
roles:
- agent
- classifier
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
19 changes: 19 additions & 0 deletions test/fixtures/generated/osinfo-version-0/amazon2023-AARCH64aulcdfm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
arguments_string: "--osinfo-version 0 amazon2023-AARCH64aulcdfm"
environment_variables: {}
expected_hash:
HOSTS:
amazon2023-AARCH64-1:
platform: amazon-2023-arm64
hypervisor: vmpooler
roles:
- agent
- ca
- classifier
- dashboard
- database
- frictionless
- master
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
19 changes: 19 additions & 0 deletions test/fixtures/generated/osinfo-version-1/amazon2023-AARCH64aulcdfm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
arguments_string: "--osinfo-version 1 amazon2023-AARCH64aulcdfm"
environment_variables: {}
expected_hash:
HOSTS:
amazon2023-AARCH64-1:
platform: amazon-2023-arm64
hypervisor: vmpooler
roles:
- agent
- ca
- classifier
- dashboard
- database
- frictionless
- master
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:

0 comments on commit 013dab5

Please sign in to comment.