Skip to content

Commit 06c83e7

Browse files
author
Ash Cripps
authored
Add Apple silicon macs (#2383)
* ansible: add DTK macs * ansible: update scripts for macos 10.16/11.0 * jenkins: add osx11 to versionselector
1 parent 5416d2d commit 06c83e7

File tree

7 files changed

+18
-1
lines changed

7 files changed

+18
-1
lines changed

ansible/ansible.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,3 +54,4 @@ ansible_winrm_server_cert_validation = ignore
5454

5555
[hosts:macos]
5656
home = /Users
57+
ansible_python_interpreter = /usr/bin/python3

ansible/inventory.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,10 @@ hosts:
138138
ubuntu1804_docker-x64-1: {ip: 165.225.151.201, user: ubuntu}
139139
ubuntu1804-x64-1: {ip: 165.225.149.88, user: ubuntu}
140140

141+
- macstadium:
142+
macos11.0-arm64-1: {ip: 199.7.163.9, user: administrator}
143+
macos11.0-arm64-2: {ip: 199.7.163.10, user: administrator}
144+
141145
- marist:
142146
zos13-s390x-1:
143147
ip: 148.100.36.133

ansible/roles/baselayout/tasks/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@
8787
- "{{ packages[os|stripversion]|default('[]') }}"
8888
- "{{ common_packages|default('[]') }}"
8989

90+
# Currently does not work on the DTK for 11.0 - The unsupported warnings cause the task to fail
9091
- name: install packages (macos)
9192
when: os|startswith("macos")
9293
become_user: administrator

ansible/roles/baselayout/vars/main.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,14 @@ packages: {
111111
'cmake,python,ccache'
112112
],
113113

114+
'macos10.16': [
115+
'cmake,python,ccache'
116+
],
117+
118+
'macos11.0': [
119+
'cmake,python,ccache'
120+
],
121+
114122
rhel7: [
115123
'gcc-c++,sudo,git,zip,unzip,iptables-services,GConf2-devel,openssl-devel',
116124
],

ansible/roles/jenkins-worker/tasks/partials/tap2junit/macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88
pip:
99
name: tap2junit
1010
state: present
11-
executable: /usr/local/bin/pip3
11+
executable: /usr/bin/pip3

ansible/roles/jenkins-worker/vars/main.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,8 @@ java_path: {
9696
'macos10.13': 'java',
9797
'macos10.14': 'java',
9898
'macos10.15': 'java',
99+
'macos10.16': 'java',
100+
'macos11.0': 'java',
99101
'smartos15': '/opt/local/java/openjdk8/bin/java',
100102
'smartos16': '/opt/local/java/openjdk8/bin/java',
101103
'smartos17': '/opt/local/java/openjdk8/bin/java',

jenkins/scripts/VersionSelectorScript.groovy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ def buildExclusions = [
108108
[ /^osx1010(?!-release-sources)/, releaseType, allVer ],
109109
[ /^osx1011/, testType, gte(14) ],
110110
[ /^osx1011/, releaseType, allVer ],
111+
[ /^osx11/, testType, lt(15) ],
111112
// osx1015 enabled for all, and builds all releases to support notarization
112113

113114
// FreeBSD -----------------------------------------------

0 commit comments

Comments
 (0)