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.

Sign up for GitHub

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

(IMAGES-1297) Adds macOS 11/12 M1 support #255

Merged
merged 1 commit into from
Jun 27, 2022
Merged

(IMAGES-1297) Adds macOS 11/12 M1 support #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions lib/beaker-hostgenerator/data.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -884,6 +884,14 @@ def osinfo
'template' => 'macos-112-x86_64'
}
},
'osx11-ARM64' => {
:general => {
'platform' => 'osx-11-arm64'
},
:vmpooler => {
'template' => 'macos-11-arm64'
}
},
'osx12-64' => {
:general => {
'platform' => 'osx-12-x86_64'
Expand All @@ -892,6 +900,14 @@ def osinfo
'template' => 'macos-12-x86_64'
}
},
'osx12-ARM64' => {
:general => {
'platform' => 'osx-12-arm64'
},
:vmpooler => {
'template' => 'macos-12-arm64'
}
},
'redhat4-32' => {
:general => {
'platform' => 'el-4-i386'
Expand Down
17 changes: 17 additions & 0 deletions test/fixtures/generated/default/osx11-ARM64u
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
arguments_string: osx11-ARM64u
environment_variables: {}
expected_hash:
HOSTS:
osx11-ARM64-1:
platform: osx-11-arm64
template: macos-11-arm64
hypervisor: vmpooler
roles:
- agent
- ca
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
17 changes: 17 additions & 0 deletions test/fixtures/generated/default/osx12-ARM64c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
arguments_string: osx12-ARM64c
environment_variables: {}
expected_hash:
HOSTS:
osx12-ARM64-1:
platform: osx-12-arm64
template: macos-12-arm64
hypervisor: vmpooler
roles:
- agent
- dashboard
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
30 changes: 30 additions & 0 deletions test/fixtures/generated/multiplatform/debian8-64c-osx12-ARM64-debian8-64d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
arguments_string: debian8-64c-osx12-ARM64-debian8-64d
environment_variables: {}
expected_hash:
HOSTS:
debian8-64-1:
platform: debian-8-amd64
template: debian-8-x86_64
hypervisor: vmpooler
roles:
- agent
- dashboard
osx12-ARM64-1:
platform: osx-12-arm64
template: macos-12-arm64
hypervisor: vmpooler
roles:
- agent
debian8-64-2:
platform: debian-8-amd64
template: debian-8-x86_64
hypervisor: vmpooler
roles:
- agent
- database
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
30 changes: 30 additions & 0 deletions test/fixtures/generated/multiplatform/debian9-64f-osx11-ARM64-debian9-64l
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
arguments_string: debian9-64f-osx11-ARM64-debian9-64l
environment_variables: {}
expected_hash:
HOSTS:
debian9-64-1:
platform: debian-9-amd64
template: debian-9-x86_64
hypervisor: vmpooler
roles:
- agent
- frictionless
osx11-ARM64-1:
platform: osx-11-arm64
template: macos-11-arm64
hypervisor: vmpooler
roles:
- agent
debian9-64-2:
platform: debian-9-amd64
template: debian-9-x86_64
hypervisor: vmpooler
roles:
- agent
- classifier
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
30 changes: 30 additions & 0 deletions test/fixtures/generated/multiplatform/osx11-ARM64u-debian9-64-osx11-ARM64m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
arguments_string: osx11-ARM64u-debian9-64-osx11-ARM64m
environment_variables: {}
expected_hash:
HOSTS:
osx11-ARM64-1:
platform: osx-11-arm64
template: macos-11-arm64
hypervisor: vmpooler
roles:
- agent
- ca
debian9-64-1:
platform: debian-9-amd64
template: debian-9-x86_64
hypervisor: vmpooler
roles:
- agent
osx11-ARM64-2:
platform: osx-11-arm64
template: macos-11-arm64
hypervisor: vmpooler
roles:
- agent
- master
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
30 changes: 30 additions & 0 deletions test/fixtures/generated/multiplatform/osx12-ARM64c-debian8-64-osx12-ARM64d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
arguments_string: osx12-ARM64c-debian8-64-osx12-ARM64d
environment_variables: {}
expected_hash:
HOSTS:
osx12-ARM64-1:
platform: osx-12-arm64
template: macos-12-arm64
hypervisor: vmpooler
roles:
- agent
- dashboard
debian8-64-1:
platform: debian-8-amd64
template: debian-8-x86_64
hypervisor: vmpooler
roles:
- agent
osx12-ARM64-2:
platform: osx-12-arm64
template: macos-12-arm64
hypervisor: vmpooler
roles:
- agent
- database
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
17 changes: 17 additions & 0 deletions test/fixtures/generated/osinfo-version-0/osx11-ARM64u
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
arguments_string: "--osinfo-version 0 osx11-ARM64u"
environment_variables: {}
expected_hash:
HOSTS:
osx11-ARM64-1:
platform: osx-11-arm64
template: macos-11-arm64
hypervisor: vmpooler
roles:
- agent
- ca
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
17 changes: 17 additions & 0 deletions test/fixtures/generated/osinfo-version-0/osx12-ARM64c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
arguments_string: "--osinfo-version 0 osx12-ARM64c"
environment_variables: {}
expected_hash:
HOSTS:
osx12-ARM64-1:
platform: osx-12-arm64
template: macos-12-arm64
hypervisor: vmpooler
roles:
- agent
- dashboard
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
17 changes: 17 additions & 0 deletions test/fixtures/generated/osinfo-version-1/osx11-ARM64u
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
arguments_string: "--osinfo-version 1 osx11-ARM64u"
environment_variables: {}
expected_hash:
HOSTS:
osx11-ARM64-1:
platform: osx-11-arm64
template: macos-11-arm64
hypervisor: vmpooler
roles:
- agent
- ca
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception:
17 changes: 17 additions & 0 deletions test/fixtures/generated/osinfo-version-1/osx12-ARM64c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
arguments_string: "--osinfo-version 1 osx12-ARM64c"
environment_variables: {}
expected_hash:
HOSTS:
osx12-ARM64-1:
platform: osx-12-arm64
template: macos-12-arm64
hypervisor: vmpooler
roles:
- agent
- dashboard
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception: