Skip to content

Commit 0af6aa2

Browse files
AshCrippsAshCripps
authored andcommitted
ansible: update scripts for macos 10.16/11.0
1 parent 417c664 commit 0af6aa2

File tree

5 files changed

+13
-1
lines changed

5 files changed

+13
-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/roles/baselayout/tasks/main.yml

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

98+
# Currently does not work on the DTK for 11.0 - The unsupported warnings cause the task to fail
9899
- name: install packages (macos)
99100
when: os|startswith("macos")
100101
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
@@ -98,6 +98,8 @@ java_path: {
9898
'macos10.13': 'java',
9999
'macos10.14': 'java',
100100
'macos10.15': 'java',
101+
'macos10.16': 'java',
102+
'macos11.0': 'java',
101103
'smartos15': '/opt/local/java/openjdk8/bin/java',
102104
'smartos16': '/opt/local/java/openjdk8/bin/java',
103105
'smartos17': '/opt/local/java/openjdk8/bin/java',

0 commit comments

Comments
 (0)