Skip to content

Commit

Permalink
Add Apple silicon macs (#2383)
Browse files Browse the repository at this point in the history
* ansible: add DTK macs

* ansible: update scripts for macos 10.16/11.0

* jenkins: add osx11 to versionselector
  • Loading branch information
Ash Cripps authored Aug 7, 2020
1 parent 5416d2d commit 06c83e7
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 1 deletion.
1 change: 1 addition & 0 deletions ansible/ansible.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,4 @@ ansible_winrm_server_cert_validation = ignore

[hosts:macos]
home = /Users
ansible_python_interpreter = /usr/bin/python3
4 changes: 4 additions & 0 deletions ansible/inventory.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,10 @@ hosts:
ubuntu1804_docker-x64-1: {ip: 165.225.151.201, user: ubuntu}
ubuntu1804-x64-1: {ip: 165.225.149.88, user: ubuntu}

- macstadium:
macos11.0-arm64-1: {ip: 199.7.163.9, user: administrator}
macos11.0-arm64-2: {ip: 199.7.163.10, user: administrator}

- marist:
zos13-s390x-1:
ip: 148.100.36.133
Expand Down
1 change: 1 addition & 0 deletions ansible/roles/baselayout/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@
- "{{ packages[os|stripversion]|default('[]') }}"
- "{{ common_packages|default('[]') }}"

# Currently does not work on the DTK for 11.0 - The unsupported warnings cause the task to fail
- name: install packages (macos)
when: os|startswith("macos")
become_user: administrator
Expand Down
8 changes: 8 additions & 0 deletions ansible/roles/baselayout/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,14 @@ packages: {
'cmake,python,ccache'
],

'macos10.16': [
'cmake,python,ccache'
],

'macos11.0': [
'cmake,python,ccache'
],

rhel7: [
'gcc-c++,sudo,git,zip,unzip,iptables-services,GConf2-devel,openssl-devel',
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
pip:
name: tap2junit
state: present
executable: /usr/local/bin/pip3
executable: /usr/bin/pip3
2 changes: 2 additions & 0 deletions ansible/roles/jenkins-worker/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ java_path: {
'macos10.13': 'java',
'macos10.14': 'java',
'macos10.15': 'java',
'macos10.16': 'java',
'macos11.0': 'java',
'smartos15': '/opt/local/java/openjdk8/bin/java',
'smartos16': '/opt/local/java/openjdk8/bin/java',
'smartos17': '/opt/local/java/openjdk8/bin/java',
Expand Down
1 change: 1 addition & 0 deletions jenkins/scripts/VersionSelectorScript.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ def buildExclusions = [
[ /^osx1010(?!-release-sources)/, releaseType, allVer ],
[ /^osx1011/, testType, gte(14) ],
[ /^osx1011/, releaseType, allVer ],
[ /^osx11/, testType, lt(15) ],
// osx1015 enabled for all, and builds all releases to support notarization

// FreeBSD -----------------------------------------------
Expand Down

0 comments on commit 06c83e7

Please sign in to comment.