Skip to content

Commit

Permalink
Add Amazon 2
Browse files Browse the repository at this point in the history 
Amazon 7 is an implementation detail, the actual OS is Amazon 2:
https://aws.amazon.com/amazon-linux-2 This adds a new target amazon2-AARCH64,
whose ABS template remains the same (amazon-7-aarch64), but platform is
different:

    ❯ bundle exec beaker-hostgenerator amazon2-AARCH64a --hypervisor abs
    ---
    HOSTS:
      amazon2-AARCH64-1:
        platform: amazon-2-aarch64
        template: amazon-7-arm64
        hypervisor: abs
        roles:
        - agent
    CONFIG: {}

    ❯ bundle exec beaker-hostgenerator amazon7-AARCH64a --hypervisor abs
    ---
    HOSTS:
      amazon7-AARCH64-1:
        platform: amazon-7-aarch64
        hypervisor: abs
        template: amazon-7-arm64
        roles:
        - agent
    CONFIG: {}

The `template` is what we request from ABS. The `platform` is what beaker uses
when constructing `Beaker::Platform.new` and allows tests to introspect the
platform they're running on, such as `if platform =~ /amazon-/`
  • Loading branch information
@joshcooper
joshcooper committed Jun 4, 2024
1 parent a02abc3 commit 9aa781a
Show file tree
Hide file tree
Showing 11 changed files with 199 additions and 0 deletions.
9 changes: 9 additions & 0 deletions lib/beaker-hostgenerator/data.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,14 @@ def osinfo
'template' => 'amazon-7-x86_64',
},
},
'amazon2-AARCH64' => {
general: {
'platform' => 'amazon-2-aarch64',
},
abs: {
'template' => 'amazon-7-arm64',
},
},
'archlinuxrolling-64' => {
general: {
'platform' => 'archlinux-rolling-x64',
Expand Down Expand Up @@ -1123,6 +1131,7 @@ def generate_osinfo
# Amazon Linux
yield %w[amazon7-64 amazon-7-x86_64]
yield %w[amazon7-AARCH64 amazon-7-aarch64]
yield %w[amazon2-AARCH64 amazon-2-aarch64]
yield %w[amazon2023-64 amazon-2023-x86_64]
yield %w[amazon2023-AARCH64 amazon-2023-aarch64]

Expand Down
14 changes: 14 additions & 0 deletions test/fixtures/generated/default/amazon2-AARCH64f
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
arguments_string: amazon2-AARCH64f
environment_variables: {}
expected_hash:
HOSTS:
amazon2-AARCH64-1:
platform: amazon-2-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/amazon2-AARCH64m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
arguments_string: amazon2-AARCH64m
environment_variables: {}
expected_hash:
HOSTS:
amazon2-AARCH64-1:
platform: amazon-2-aarch64
hypervisor: vmpooler
roles:
- agent
- master
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
26 changes: 26 additions & 0 deletions test/fixtures/generated/multiplatform/amazon2-AARCH64f-solaris11-64-amazon2-AARCH64l
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
arguments_string: amazon2-AARCH64f-solaris11-64-amazon2-AARCH64l
environment_variables: {}
expected_hash:
HOSTS:
amazon2-AARCH64-1:
platform: amazon-2-aarch64
hypervisor: vmpooler
roles:
- agent
- frictionless
solaris11-64-1:
platform: solaris-11-i386
template: solaris-11-x86_64
hypervisor: vmpooler
roles:
- agent
amazon2-AARCH64-2:
platform: amazon-2-aarch64
hypervisor: vmpooler
roles:
- agent
- classifier
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
26 changes: 26 additions & 0 deletions test/fixtures/generated/multiplatform/amazon2-AARCH64m-solaris11-32-amazon2-AARCH64u
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
arguments_string: amazon2-AARCH64m-solaris11-32-amazon2-AARCH64u
environment_variables: {}
expected_hash:
HOSTS:
amazon2-AARCH64-1:
platform: amazon-2-aarch64
hypervisor: vmpooler
roles:
- agent
- master
solaris11-32-1:
platform: solaris-11-i386
template: solaris-11-x86_64
hypervisor: vmpooler
roles:
- agent
amazon2-AARCH64-2:
platform: amazon-2-aarch64
hypervisor: vmpooler
roles:
- agent
- ca
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
27 changes: 27 additions & 0 deletions test/fixtures/generated/multiplatform/solaris11-32l-amazon2-AARCH64-solaris11-32f
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
arguments_string: solaris11-32l-amazon2-AARCH64-solaris11-32f
environment_variables: {}
expected_hash:
HOSTS:
solaris11-32-1:
platform: solaris-11-i386
template: solaris-11-x86_64
hypervisor: vmpooler
roles:
- agent
- classifier
amazon2-AARCH64-1:
platform: amazon-2-aarch64
hypervisor: vmpooler
roles:
- agent
solaris11-32-2:
platform: solaris-11-i386
template: solaris-11-x86_64
hypervisor: vmpooler
roles:
- agent
- frictionless
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
27 changes: 27 additions & 0 deletions test/fixtures/generated/multiplatform/solaris11-64d-amazon2-AARCH64-solaris11-64c
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
arguments_string: solaris11-64d-amazon2-AARCH64-solaris11-64c
environment_variables: {}
expected_hash:
HOSTS:
solaris11-64-1:
platform: solaris-11-i386
template: solaris-11-x86_64
hypervisor: vmpooler
roles:
- agent
- database
amazon2-AARCH64-1:
platform: amazon-2-aarch64
hypervisor: vmpooler
roles:
- agent
solaris11-64-2:
platform: solaris-11-i386
template: solaris-11-x86_64
hypervisor: vmpooler
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/amazon2-AARCH64f
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
arguments_string: "--osinfo-version 0 amazon2-AARCH64f"
environment_variables: {}
expected_hash:
HOSTS:
amazon2-AARCH64-1:
platform: amazon-2-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/amazon2-AARCH64m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
arguments_string: "--osinfo-version 0 amazon2-AARCH64m"
environment_variables: {}
expected_hash:
HOSTS:
amazon2-AARCH64-1:
platform: amazon-2-aarch64
hypervisor: vmpooler
roles:
- agent
- master
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
14 changes: 14 additions & 0 deletions test/fixtures/generated/osinfo-version-1/amazon2-AARCH64f
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
arguments_string: "--osinfo-version 1 amazon2-AARCH64f"
environment_variables: {}
expected_hash:
HOSTS:
amazon2-AARCH64-1:
platform: amazon-2-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/amazon2-AARCH64m
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
arguments_string: "--osinfo-version 1 amazon2-AARCH64m"
environment_variables: {}
expected_hash:
HOSTS:
amazon2-AARCH64-1:
platform: amazon-2-aarch64
hypervisor: vmpooler
roles:
- agent
- master
CONFIG:
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:

0 comments on commit 9aa781a

Please sign in to comment.