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

Jump to bottom

(IMAGES-1334) Add support for macOS 12 #245

Merged
merged 1 commit into from
Feb 18, 2022
Merged

(IMAGES-1334) Add support for macOS 12 #245

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
8 changes: 8 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'
}
},
'osx12-64' => {
:general => {
'platform' => 'osx-12-x86_64'
},
:vmpooler => {
'template' => 'macos-12-x86_64'
}
},
'redhat4-32' => {
:general => {
'platform' => 'el-4-i386'
Expand Down
17 changes: 17 additions & 0 deletions test/fixtures/generated/default/osx12-64d
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
arguments_string: osx12-64d
environment_variables: {}
expected_hash:
HOSTS:
osx12-64-1:
platform: osx-12-x86_64
template: macos-12-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/debian10-32l-osx12-64-debian10-32f
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
arguments_string: debian10-32l-osx12-64-debian10-32f
environment_variables: {}
expected_hash:
HOSTS:
debian10-32-1:
platform: debian-10-i386
template: debian-10-i386
hypervisor: vmpooler
roles:
- agent
- classifier
osx12-64-1:
platform: osx-12-x86_64
template: macos-12-x86_64
hypervisor: vmpooler
roles:
- agent
debian10-32-2:
platform: debian-10-i386
template: debian-10-i386
hypervisor: vmpooler
roles:
- agent
- frictionless
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-64d-debian10-32-osx12-64c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
arguments_string: osx12-64d-debian10-32-osx12-64c
environment_variables: {}
expected_hash:
HOSTS:
osx12-64-1:
platform: osx-12-x86_64
template: macos-12-x86_64
hypervisor: vmpooler
roles:
- agent
- database
debian10-32-1:
platform: debian-10-i386
template: debian-10-i386
hypervisor: vmpooler
roles:
- agent
osx12-64-2:
platform: osx-12-x86_64
template: macos-12-x86_64
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-0/osx12-64d
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-64d"
environment_variables: {}
expected_hash:
HOSTS:
osx12-64-1:
platform: osx-12-x86_64
template: macos-12-x86_64
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-1/osx12-64d
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-64d"
environment_variables: {}
expected_hash:
HOSTS:
osx12-64-1:
platform: osx-12-x86_64
template: macos-12-x86_64
hypervisor: vmpooler
roles:
- agent
- database
CONFIG:
nfs_server: none
consoleport: 443
pooling_api: https://vmpooler-prod.k8s.infracore.puppet.net/
expected_exception: