ansible: add 10.15 macs (#2189)

* ansible: Add newer versions of macOS * ansible: add macos10.15 release machine * ansible: fix openjdk download on mac * ansible: add 3 test machines also tidied up the nearform section and put it in order with the rest of the document * ansible: tweak macos install
nodejs · Mar 4, 2020 · 6ee0aa0 · 6ee0aa0
1 parent d97f215
commit 6ee0aa0
Show file tree

Hide file tree

Showing 7 changed files with 58 additions and 22 deletions.
diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg
@@ -48,4 +48,4 @@ ansible_connection                   = winrm
 ansible_winrm_server_cert_validation = ignore
 
 [hosts:macos]
-home = /User
+home = /Users
diff --git a/ansible/inventory.yml b/ansible/inventory.yml
@@ -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}
@@ -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:
 
@@ -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
@@ -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}
diff --git a/ansible/roles/baselayout/vars/main.yml b/ansible/roles/baselayout/vars/main.yml
@@ -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: [

diff --git a/ansible/roles/java-base/tasks/main.yml b/ansible/roles/java-base/tasks/main.yml
@@ -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
+
 - 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:

diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml
@@ -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',

diff --git a/ansible/roles/jenkins-worker/tasks/partials/tap2junit/macos.yml b/ansible/roles/jenkins-worker/tasks/partials/tap2junit/macos.yml
@@ -8,4 +8,4 @@
   pip:
     name: tap2junit
     state: present
-    executable: /usr/local/bin/pip2
+    executable: /usr/local/bin/pip3
diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml
@@ -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',