Merge pull request #392 from skyamgarp/add-macos15

Add support for macos15(ARM)
voxpupuli · Dec 20, 2024 · 3e21ad1 · 3e21ad1
2 parents ffba51f + 62f988c
commit 3e21ad1
Show file tree

Hide file tree

Showing 6 changed files with 100 additions and 0 deletions.
diff --git a/lib/beaker-hostgenerator/data.rb b/lib/beaker-hostgenerator/data.rb
@@ -1216,6 +1216,7 @@ def generate_osinfo
       # macOS
       yield %w[osx14-64 osx-14-x86_64]
       yield %w[osx14-ARM64 osx-14-arm64]
+      yield %w[osx15-ARM64 osx-15-arm64]
     end
   end
 end
diff --git a/test/fixtures/generated/default/osx15-ARM64m b/test/fixtures/generated/default/osx15-ARM64m
@@ -0,0 +1,14 @@
+---
+arguments_string: osx15-ARM64m
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    osx15-ARM64-1:
+      platform: osx-15-arm64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - master
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/multiplatform/almalinux8-64a-osx15-ARM64-almalinux8-64aulcdfm b/test/fixtures/generated/multiplatform/almalinux8-64a-osx15-ARM64-almalinux8-64aulcdfm
@@ -0,0 +1,31 @@
+---
+arguments_string: almalinux8-64a-osx15-ARM64-almalinux8-64aulcdfm
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    almalinux8-64-1:
+      platform: el-8-x86_64
+      hypervisor: vmpooler
+      template: almalinux-8-x86_64
+      roles:
+      - agent
+    osx15-ARM64-1:
+      platform: osx-15-arm64
+      hypervisor: vmpooler
+      roles:
+      - agent
+    almalinux8-64-2:
+      platform: el-8-x86_64
+      hypervisor: vmpooler
+      template: almalinux-8-x86_64
+      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-ARM64m-almalinux8-64-osx15-ARM64u b/test/fixtures/generated/multiplatform/osx15-ARM64m-almalinux8-64-osx15-ARM64u
@@ -0,0 +1,26 @@
+---
+arguments_string: osx15-ARM64m-almalinux8-64-osx15-ARM64u
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    osx15-ARM64-1:
+      platform: osx-15-arm64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - master
+    almalinux8-64-1:
+      platform: el-8-x86_64
+      hypervisor: vmpooler
+      template: almalinux-8-x86_64
+      roles:
+      - agent
+    osx15-ARM64-2:
+      platform: osx-15-arm64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - ca
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/osinfo-version-0/osx15-ARM64m b/test/fixtures/generated/osinfo-version-0/osx15-ARM64m
@@ -0,0 +1,14 @@
+---
+arguments_string: "--osinfo-version 0 osx15-ARM64m"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    osx15-ARM64-1:
+      platform: osx-15-arm64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - master
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception:
diff --git a/test/fixtures/generated/osinfo-version-1/osx15-ARM64m b/test/fixtures/generated/osinfo-version-1/osx15-ARM64m
@@ -0,0 +1,14 @@
+---
+arguments_string: "--osinfo-version 1 osx15-ARM64m"
+environment_variables: {}
+expected_hash:
+  HOSTS:
+    osx15-ARM64-1:
+      platform: osx-15-arm64
+      hypervisor: vmpooler
+      roles:
+      - agent
+      - master
+  CONFIG:
+    pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
+expected_exception: