Skip to content

Add Apple silicon macs #2383

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

Merged
merged 3 commits into from
Aug 7, 2020
Merged

Add Apple silicon macs #2383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8cfc396
ansible: add DTK macs
Jul 14, 2020
06fbba8
ansible: update scripts for macos 10.16/11.0
Jul 21, 2020
1dd27f9
jenkins: add osx11 to versionselector
Jul 21, 2020
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
1 change: 1 addition & 0 deletions ansible/ansible.cfg
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion ansible/roles/jenkins-worker/tasks/partials/tap2junit/macos.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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