Add amazon-2023-x86_64

voxpupuli · Sep 22, 2023 · e4cb325 · e4cb325
1 parent ea5de16
commit e4cb325
Show file tree

Hide file tree

Showing 7 changed files with 99 additions and 1 deletion.
diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb
@@ -1098,6 +1098,9 @@ def generate_osinfo
         yield ["freebsd#{release}-64", "freebsd-#{release}-amd64"]
       end
 
+      # Amazon Linux
+      yield %w[amazon2023-64 amazon-2023-x86_64]
+
       # AlmaLinux and Rocky
       %w[almalinux rocky].each do |os|
         (8..9).each do |release|

diff --git a/lib/beaker-hostgenerator/hypervisor/abs.rb b/lib/beaker-hostgenerator/hypervisor/abs.rb
@@ -25,7 +25,7 @@ def generate_node(node_info, base_config, bhg_version)
         case node_info['ostype']
         when /^(almalinux|centos|oracle|redhat|rocky|scientific)/
           base_config['template'] ||= base_config['platform'].gsub(/^el/, ::Regexp.last_match(1))
-        when /^fedora/, /^opensuse/, /^panos/
+        when /^amazon/, /^fedora/, /^opensuse/, /^panos/
           base_config['template'] ||= base_config['platform']
         when /^(debian|ubuntu)/
           os = Regexp.last_match(1)

diff --git a/test/fixtures/generated/default/amazon2023-64d b/test/fixtures/generated/default/amazon2023-64d
@@ -0,0 +1,14 @@
+---
+arguments_string: amazon2023-64d
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    amazon2023-64-1:
+      platform: amazon-2023-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - database
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/multiplatform/amazon2023-64d-vro71-64-amazon2023-64c b/test/fixtures/generated/multiplatform/amazon2023-64d-vro71-64-amazon2023-64c
@@ -0,0 +1,26 @@
+---
+arguments_string: amazon2023-64d-vro71-64-amazon2023-64c
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    amazon2023-64-1:
+      platform: amazon-2023-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - database
+    vro71-64-1:
+      platform: sles-11-x86_64
+      template: vro-71-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    amazon2023-64-2:
+      platform: amazon-2023-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - dashboard
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/multiplatform/vro71-64c-amazon2023-64-vro71-64d b/test/fixtures/generated/multiplatform/vro71-64c-amazon2023-64-vro71-64d
@@ -0,0 +1,27 @@
+---
+arguments_string: vro71-64c-amazon2023-64-vro71-64d
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    vro71-64-1:
+      platform: sles-11-x86_64
+      template: vro-71-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - dashboard
+    amazon2023-64-1:
+      platform: amazon-2023-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    vro71-64-2:
+      platform: sles-11-x86_64
+      template: vro-71-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - database
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/osinfo-version-0/amazon2023-64d b/test/fixtures/generated/osinfo-version-0/amazon2023-64d
@@ -0,0 +1,14 @@
+---
+arguments_string: "--osinfo-version 0 amazon2023-64d"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    amazon2023-64-1:
+      platform: amazon-2023-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - database
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/osinfo-version-1/amazon2023-64d b/test/fixtures/generated/osinfo-version-1/amazon2023-64d
@@ -0,0 +1,14 @@
+---
+arguments_string: "--osinfo-version 1 amazon2023-64d"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    amazon2023-64-1:
+      platform: amazon-2023-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - database
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: