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.

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

Add Amazon 2 #372

Merged
merged 1 commit into from
Jun 4, 2024
Merged

Add Amazon 2 #372

merged 1 commit into from
Jun 4, 2024

Conversation

joshcooper
Copy link
Contributor

@joshcooper joshcooper commented Jun 3, 2024

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 host.platform =~ /amazon-/

❯ env | grep BEAKER                                                                                     
BEAKER_VERSION=https://github.com/voxpupuli/beaker#amazon2
BEAKER_PUPPET_VERSION=~> 4.0
BEAKER_HOSTGENERATOR_VERSION=https://github.com/voxpupuli/beaker-hostgenerator#amazon2
❯ cd ~/work/facter/acceptance
❯ bundle update
❯ env SHA=c6c5de5b1457d0cad36bcbb0ee94ec3c3486014d HOSTS=amazon2-AARCH64a bundle exec rake ci:test:setup

  17:32:52$ yum -y  install puppet-agent

...SNIP...

     Dependencies Resolved
    
    ================================================================================
     Package
         Arch    Version
                     Repository                                                Size
    ================================================================================
    Installing:
     puppet-agent
         aarch64 8.6.0.96.gc6c5de5b1-1.amazon2
                     pl-puppet-agent-c6c5de5b1457d0cad36bcbb0ee94ec3c3486014d  26 M
    
    Transaction Summary
    ================================================================================
    Install  1 Package
    Total download size: 26 M
    Installed size: 122 M
    Downloading packages:
    Running transaction check
    Running transaction test
    Transaction test succeeded
    Running transaction
      Installing : puppet-agent-8.6.0.96.gc6c5de5b1-1.amazon2.aarch64           1/1     
      Verifying  : puppet-agent-8.6.0.96.gc6c5de5b1-1.amazon2.aarch64           1/1     
    
    Installed:
      puppet-agent.aarch64 0:8.6.0.96.gc6c5de5b1-1.amazon2                          
    Complete!

@joshcooper joshcooper force-pushed the amazon2 branch 3 times, most recently from adde8f2 to f02c9a9 Compare June 4, 2024 01:27
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-/`
@bastelfreak bastelfreak merged commit bbd2949 into master Jun 4, 2024
7 checks passed
@bastelfreak bastelfreak deleted the amazon2 branch June 4, 2024 06:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants