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

Jump to bottom

(PA-5948) Update host generator to use aarch64 for amazon linux #345

Merged
merged 1 commit into from
Nov 20, 2023
Merged

(PA-5948) Update host generator to use aarch64 for amazon linux #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/beaker-hostgenerator/data.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1111,7 +1111,7 @@

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

Check warning on line 1114 in lib/beaker-hostgenerator/data.rb

View check run for this annotation

Codecov / codecov/patch

lib/beaker-hostgenerator/data.rb#L1114 

Added line #L1114 was not covered by tests

# AlmaLinux and Rocky
%w[almalinux rocky].each do |os|
Expand Down
4 changes: 2 additions & 2 deletions lib/beaker-hostgenerator/hypervisor/abs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
case node_info['ostype']
when /^(almalinux|centos|oracle|redhat|rocky|scientific)/
base_config['template'] ||= base_config['platform']&.gsub(/^el/, ::Regexp.last_match(1))
when /^aix/, /^amazon/, /^fedora/, /^opensuse/, /^panos/
when /^aix/, /^fedora/, /^opensuse/, /^panos/

Check warning on line 28 in lib/beaker-hostgenerator/hypervisor/abs.rb

View check run for this annotation

Codecov / codecov/patch

lib/beaker-hostgenerator/hypervisor/abs.rb#L28 

Added line #L28 was not covered by tests
base_config['template'] ||= base_config['platform']
when /^(debian|ubuntu)/
when /^(debian|ubuntu|amazon)/

Check warning on line 30 in lib/beaker-hostgenerator/hypervisor/abs.rb

View check run for this annotation

Codecov / codecov/patch

lib/beaker-hostgenerator/hypervisor/abs.rb#L30 

Added line #L30 was not covered by tests
os = Regexp.last_match(1)
base_template = node_info['ostype'].sub(os, "#{os}-")
arch = case node_info['bits']
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/generated/default/amazon2023-AARCH64aulcdfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ environment_variables: {}
expected_hash:
HOSTS:
amazon2023-AARCH64-1:
platform: amazon-2023-arm64
platform: amazon-2023-aarch64
hypervisor: vmpooler
roles:
- agent
Expand Down
4 changes: 2 additions & 2 deletions ...tures/generated/multiplatform/amazon2023-AARCH64aulcdfm-solaris114-64-amazon2023-AARCH64a
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ environment_variables: {}
expected_hash:
HOSTS:
amazon2023-AARCH64-1:
platform: amazon-2023-arm64
platform: amazon-2023-aarch64
hypervisor: vmpooler
roles:
- agent
Expand All @@ -22,7 +22,7 @@ expected_hash:
roles:
- agent
amazon2023-AARCH64-2:
platform: amazon-2023-arm64
platform: amazon-2023-aarch64
hypervisor: vmpooler
roles:
- agent
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/generated/multiplatform/solaris114-64f-amazon2023-AARCH64-solaris114-64l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ expected_hash:
- agent
- frictionless
amazon2023-AARCH64-1:
platform: amazon-2023-arm64
platform: amazon-2023-aarch64
hypervisor: vmpooler
roles:
- agent
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/generated/osinfo-version-0/amazon2023-AARCH64aulcdfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ environment_variables: {}
expected_hash:
HOSTS:
amazon2023-AARCH64-1:
platform: amazon-2023-arm64
platform: amazon-2023-aarch64
hypervisor: vmpooler
roles:
- agent
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/generated/osinfo-version-1/amazon2023-AARCH64aulcdfm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ environment_variables: {}
expected_hash:
HOSTS:
amazon2023-AARCH64-1:
platform: amazon-2023-arm64
platform: amazon-2023-aarch64
hypervisor: vmpooler
roles:
- agent
Expand Down