Skip to content
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

ansible: add 10.15 macs #2189

Merged
merged 5 commits into from
Feb 26, 2020
Merged

ansible: add 10.15 macs #2189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf65dae
ansible: Add newer versions of macOS
Jan 23, 2020
54e9439
ansible: add macos10.15 release machine
Feb 19, 2020
18dac80
ansible: fix openjdk download on mac
Feb 20, 2020
5886275
ansible: add 3 test machines
Feb 20, 2020
aa61f03
ansible: tweak macos install
Feb 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
2 changes: 1 addition & 1 deletion ansible/ansible.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ ansible_connection = winrm
ansible_winrm_server_cert_validation = ignore

[hosts:macos]
home = /User
home = /Users
40 changes: 25 additions & 15 deletions ansible/inventory.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,30 @@ hosts:
smartos18-x64-2: {ip: 165.225.148.12}
ubuntu1604_arm_cross-x64-1: {ip: 165.225.151.28, user: ubuntu}

- requireio:
rvagg-debian10-armv6l_pi1p-1: {ip: 192.168.2.40, user: pi, alias: iojs-ns-pi1p-1 }
andineck-debian10-armv6l_pi1p-1: {ip: 192.168.2.41, user: pi, alias: iojs-ns-pi1p-2 }
osx1010-x64-1: {ip: 192.168.2.211, user: iojs}
- macstadium:
macos10.11-x64-1: {ip: 207.254.58.162, port: 10013, user: administrator}
macos10.10-x64-1: {ip: 207.254.58.162, port: 10014, user: administrator}

- marist:
zos13-s390x-1: {ip: 148.100.36.135, user: Unix1}

- nearform:
macos10.15-x64-1: {ip: 83.147.191.69, user: administrator}

- osuosl:
aix61-ppc64_be-1: {ip: 140.211.9.99}
ubuntu1404-ppc64_be-1: {ip: 140.211.168.76}
ubuntu1404-ppc64_le-1: {ip: 140.211.168.66}
centos7-ppc64_le-1: {ip: 140.211.168.61, user: centos}

- packetnet:
centos7-arm64-1: {ip: 147.75.104.218}

- requireio:
rvagg-debian10-armv6l_pi1p-1: {ip: 192.168.2.40, user: pi, alias: iojs-ns-pi1p-1 }
andineck-debian10-armv6l_pi1p-1: {ip: 192.168.2.41, user: pi, alias: iojs-ns-pi1p-2 }
osx1010-x64-1: {ip: 192.168.2.211, user: iojs}

- scaleway:
ubuntu1604-armv7l-1: {ip: 212.47.245.242}
ubuntu1604-armv7l-2: {ip: 212.47.234.107}
Expand All @@ -63,15 +76,9 @@ hosts:
centos6-x64-1: {ip: 169.62.77.228}


- packetnet:
centos7-arm64-1: {ip: 147.75.104.218}

- macstadium:
macos10.11-x64-1: {ip: 207.254.58.162, port: 10013, user: administrator}
macos10.10-x64-1: {ip: 207.254.58.162, port: 10014, user: administrator}

- marist:
zos13-s390x-1: {ip: 148.100.36.135, user: Unix1}


- test:

Expand Down Expand Up @@ -151,6 +158,13 @@ hosts:
win10_vs2017-arm64-1: {}
win10_vs2017-arm64-2: {}

- nearform:
macos10.15-x64-1: {ip: 83.147.191.70, user: administrator}
macos10.15-x64-2: {ip: 83.147.191.71, user: administrator}
macos10.15-x64-3: {ip: 83.147.191.72, user: administrator}
intel-ubuntu1604-x64-1: {ip: 92.51.196.114}
intel-ubuntu1604-x64-2: {ip: 92.51.196.115}


- osuosl:
# secret for -1 was compromised, do not use -1 name
Expand Down Expand Up @@ -258,7 +272,3 @@ hosts:
# remember to update Jenkins worker IP whitelist in github-bot
ubuntu1604-x64-1: {ip: 147.75.70.41, alias: jenkins-workspace-1}
ubuntu1604-x64-2: {ip: 147.75.73.189, alias: jenkins-workspace-2}

- nearform:
intel-ubuntu1604-x64-1: {ip: 92.51.196.114}
intel-ubuntu1604-x64-2: {ip: 92.51.196.115}
20 changes: 17 additions & 3 deletions ansible/roles/baselayout/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,15 +75,29 @@ packages: {
],

'macos10.10': [
'python@2,python,ccache'
'python,ccache'
],

'macos10.11': [
'python@2,python,ccache'
'python,ccache'
],

'macos10.12': [
'python@2,python,ccache'
'python,ccache'
],

'macos10.13': [
'python,ccache'
],


'macos10.14': [
'python,ccache'
],


'macos10.15': [
'python,ccache'
],

rhel7: [
Expand Down
11 changes: 10 additions & 1 deletion ansible/roles/java-base/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,19 @@
- java.rc > 0 and not os|startswith("macos")
package: name="{{ java_package_name }}" state=present

- name: install java tap (macOS)
become_user: administrator
when: java.rc > 0 and os|startswith("macos")
homebrew_tap:
name: AdoptOpenJDK/openjdk
state: present
Comment on lines +98 to +103
Copy link
Member Author

@AshCripps AshCripps Feb 20, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is effectively duplicated code from

build/ansible/roles/package-upgrade/tasks/partials/brew.yml

Lines 36 to 39 in 1cbb6cf

- name: Add AdoptOpenJDK Java Repo
become_user: administrator
homebrew_tap:
name: AdoptOpenJDK/openjdk
but I needed this change to get be able install the openjdk, even though ansible tells me the task ive linked to ran ok. @nodejs/build anyone have an ideas/experience as to why this code works in one place but not another?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So partials/brew.yml ran and you saw it running homebrew_tap for the AdoptOpenJDK/openjdk cask and the next task, which installs the package, failed until you yanked the homebrew_tap into this position? It's not an ordering problem is it, partials/brew.yml ran before this didn't it?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah I can see partials/brew,yml run but it reports nothing changed under add AdoptOpenJDK repo it wasnt until I add the tap to this position that anything happened


- name: install java (macOS)
become_user: administrator
when: java.rc > 0 and os|startswith("macos")
package: name="{{ java_package_name }}" state=present
homebrew_cask:
name: "{{ java_package_name }}"
state: present

- name: check if java is installed AIX
stat:
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/java-base/vars/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ packages: {
'debian10': 'openjdk-8-jre-headless',
'fedora': 'java-1.8.0-openjdk-headless',
'freebsd': 'openjdk8-jre',
'macos': 'adoptopenjdk-openjdk8',
'macos': 'adoptopenjdk8',
'rhel7': 'java-1.8.0-openjdk',
'smartos': 'openjdk8',
'ubuntu': 'openjdk-8-jre-headless',
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/pip2
executable: /usr/local/bin/pip3
3 changes: 3 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 @@ -89,6 +89,9 @@ java_path: {
'macos10.10': 'java',
'macos10.11': 'java',
'macos10.12': 'java',
'macos10.13': 'java',
'macos10.14': 'java',
'macos10.15': 'java',
'smartos15': '/opt/local/java/openjdk8/bin/java',
'smartos16': '/opt/local/java/openjdk8/bin/java',
'smartos17': '/opt/local/java/openjdk8/bin/java',
Expand Down