Merge pull request #397 from span786/PA-6776-adding-osx-15-x86_64

(PA-6776): Added osx-15-x86_64 support.
voxpupuli · Jan 29, 2025 · 04703e6 · 04703e6
2 parents 5ca9134 + 437588b
commit 04703e6
Show file tree

Hide file tree

Showing 6 changed files with 119 additions and 0 deletions.
diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb
@@ -1217,6 +1217,7 @@ def generate_osinfo
       yield %w[osx14-64 osx-14-x86_64]
       yield %w[osx14-ARM64 osx-14-arm64]
       yield %w[osx15-ARM64 osx-15-arm64]
+      yield %w[osx15-64 osx-15-x86_64]
     end
   end
 end
diff --git a/test/fixtures/generated/default/osx15-64aulcdfm b/test/fixtures/generated/default/osx15-64aulcdfm
@@ -0,0 +1,19 @@
+---
+arguments_string: osx15-64aulcdfm
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    osx15-64-1:
+      platform: osx-15-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/multiplatform/osx15-64aulcdfm-rocky9-AARCH64-osx15-64a b/test/fixtures/generated/multiplatform/osx15-64aulcdfm-rocky9-AARCH64-osx15-64a
@@ -0,0 +1,30 @@
+---
+arguments_string: osx15-64aulcdfm-rocky9-AARCH64-osx15-64a
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    osx15-64-1:
+      platform: osx-15-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
+    rocky9-AARCH64-1:
+      platform: el-9-aarch64
+      template: rocky-9-arm64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    osx15-64-2:
+      platform: osx-15-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/multiplatform/rocky9-AARCH64a-osx15-64-rocky9-AARCH64aulcdfm b/test/fixtures/generated/multiplatform/rocky9-AARCH64a-osx15-64-rocky9-AARCH64aulcdfm
@@ -0,0 +1,31 @@
+---
+arguments_string: rocky9-AARCH64a-osx15-64-rocky9-AARCH64aulcdfm
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    rocky9-AARCH64-1:
+      platform: el-9-aarch64
+      template: rocky-9-arm64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    osx15-64-1:
+      platform: osx-15-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    rocky9-AARCH64-2:
+      platform: el-9-aarch64
+      template: rocky-9-arm64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/osinfo-version-0/osx15-64aulcdfm b/test/fixtures/generated/osinfo-version-0/osx15-64aulcdfm
@@ -0,0 +1,19 @@
+---
+arguments_string: "--osinfo-version 0 osx15-64aulcdfm"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    osx15-64-1:
+      platform: osx-15-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/osinfo-version-1/osx15-64aulcdfm b/test/fixtures/generated/osinfo-version-1/osx15-64aulcdfm
@@ -0,0 +1,19 @@
+---
+arguments_string: "--osinfo-version 1 osx15-64aulcdfm"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    osx15-64-1:
+      platform: osx-15-x86_64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - ca
+      - classifier
+      - dashboard
+      - database
+      - frictionless
+      - master
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: