Skip to content

Commit ff91266

Browse files
committed
fix missing pieces
1 parent ffb1bb5 commit ff91266

File tree

1 file changed

+39
-19
lines changed

1 file changed

+39
-19
lines changed

macos/playbook/macos.yml

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,30 +43,43 @@
4343
name: help2man
4444
state: present
4545

46+
- name: install gnu tar
47+
community.general.homebrew:
48+
name: gnu-tar
49+
state: present
50+
4651
- name: install openjdk 11
4752
community.general.homebrew:
4853
name: 'openjdk@11'
4954
state: present
5055

51-
- name: install OpenJDK 8
52-
block:
53-
- name: fetch distribution
54-
get_url:
55-
url: https://cdn.azul.com/zulu/bin/zulu8.74.0.17-ca-jre8.0.392-macosx_aarch64.tar.gz
56-
dest: /tmp/openjdk8.tgz
57-
58-
- name: unpack distribution
59-
unarchive:
60-
src: /tmp/openjdk8.tgz
61-
dest: /opt/java/openjdk8
62-
extra_opts:
63-
- --strip-component 1
64-
creates: /opt/java/openjdk8
65-
66-
- name: remove distribution
67-
file:
68-
dest: /tmp/openjdk8.tgz
69-
state: absent
56+
- name: install openjdk 8
57+
get_url:
58+
url: https://cdn.azul.com/zulu/bin/zulu8.74.0.17-ca-jre8.0.392-macosx_aarch64.tar.gz
59+
dest: /tmp/openjdk8.tgz
60+
61+
- name: create openjdk 8 install dir
62+
become: true
63+
file:
64+
path: /opt/java/openjdk8
65+
state: directory
66+
recurse: true
67+
owner: administrator
68+
69+
- name: unpack distribution
70+
unarchive:
71+
src: /tmp/openjdk8.tgz
72+
dest: /opt/java/openjdk8
73+
remote_src: true
74+
extra_opts:
75+
- "--strip-components=1"
76+
environment:
77+
PATH: "/opt/homebrew/opt/gnu-tar/libexec/gnubin:{{ ansible_env.PATH }}"
78+
79+
- name: remove distribution
80+
file:
81+
dest: /tmp/openjdk8.tgz
82+
state: absent
7083

7184
- name: brew link openjdk force
7285
command: /opt/homebrew/bin/brew link openjdk@11 --force
@@ -99,17 +112,23 @@
99112
system: true
100113

101114
- name: configure OpenJDK 8 for Clouseau
115+
become: true
102116
lineinfile:
103117
path: /Users/jenkins2/.zshenv
104118
line: export CLOUSEAU_JAVA_HOME=/opt/java/openjdk8
119+
state: present
120+
create: true
121+
owner: jenkins2
105122

106123
- name: create LaunchDaemons dir
124+
become: true
107125
file:
108126
state: directory
109127
dest: /Users/administrator/Library/LaunchDaemons
110128
owner: administrator
111129

112130
- name: upload launchd config
131+
become: true
113132
copy:
114133
src: ./files/org.apache.couchdb.mac.arm.ci.plist
115134
dest: /Library/LaunchDaemons/org.apache.couchdb.mac.arm.ci.plist
@@ -118,6 +137,7 @@
118137
- name: bootstrap the launchd service
119138
become: true
120139
command: launchctl bootstrap system /Library/LaunchDaemons/org.apache.couchdb.mac.arm.ci.plist
140+
ignore_errors: true
121141

122142
- name: enable the launchd service - might be rundant
123143
become: true

0 commit comments

Comments
 (0)