ansible: add macos11-x64 macs (#2778)

* ansible: add macos11-x64 macs

* move to openjdk java

* stop testing on osx1014 on 17.x+

* add packages

* remove the macos10.16 field

Author: Ash Cripps

ansible/inventory.yml

@@ -274,6 +274,16 @@ hosts:
             ip: 199.7.167.101
             port: 8824
             user: administrator
+        macos11-x64-1:
+            ansible_python_interpreter: /usr/bin/python3
+            ip: 199.7.167.101
+            port: 8823
+            user: administrator
+        macos11-x64-2:
+            ansible_python_interpreter: /usr/bin/python3
+            ip: 199.7.167.99
+            port: 8824
+            user: administrator
 
     - iinthecloud:
         ibmi73-ppc64_be-1: {ip: 65.183.160.52, user: nodejs}

ansible/roles/baselayout/vars/main.yml

@@ -136,6 +136,10 @@ packages: {
     'cmake,python,ccache'
   ],
 
+  'macos11': [
+    'cmake,python,ccache'
+  ],
+
   rhel7: [
     'gcc-c++,sudo,git,zip,unzip,iptables-services,GConf2-devel,openssl-devel,python3',
   ],

ansible/roles/java-base/tasks/main.yml

@@ -48,26 +48,26 @@
 
 - name: install java tap (macOS)
   become_user: administrator
-  when: java.rc > 0 and os|startswith("macos10")
+  when: java.rc > 0 and os|startswith("macos") and arch == "x64"
   homebrew_tap:
         name: AdoptOpenJDK/openjdk
         state: present
 
 - name: install java (macOS)
   become_user: administrator
-  when: java.rc > 0 and os|startswith("macos10")
+  when: java.rc > 0 and os|startswith("macos") and arch == "x64"
   homebrew_cask:
         name: "{{ java_package_name }}"
         state: present
 
 - name: Fetch java (Apple Silicon)
-  when: os|startswith("macos11")
+  when: os|startswith("macos11") and arch == "arm64"
   shell:
     chdir: "/Users/administrator"
     cmd: "curl -L -o zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64.tar.gz https://cdn.azul.com/zulu/bin/zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64.tar.gz"
 
 - name: Extract java (Apple Silicon)
-  when: os|startswith("macos11")
+  when: os|startswith("macos11") and arch == "arm64"
   shell:
     chdir: "/Users/administrator"
     cmd: "tar -xf zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64.tar.gz"

ansible/roles/java-base/vars/main.yml

@@ -13,7 +13,7 @@ packages: {
   'fedora': 'java-1.8.0-openjdk-headless',
   'freebsd': 'openjdk8-jre',
   'ibmi': 'openjdk-11-ea',
-  'macos10': 'adoptopenjdk8',
+  'macos': 'adoptopenjdk8',
   'rhel7': 'java-1.8.0-openjdk',
   'smartos': 'openjdk8',
   'ubuntu': 'openjdk-8-jre-headless',

ansible/roles/jenkins-worker/vars/main.yml

@@ -91,7 +91,7 @@ java_path: {
   'macos10.13': 'java',
   'macos10.14': 'java',
   'macos10.15': 'java',
-  'macos10.16': 'java',
+  'macos11': 'java',
   # Currently hardcoded untill adopt have their build available
   'macos11.0': '/Users/administrator/zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64/bin/java',
   'smartos15': '/opt/local/java/openjdk8/bin/java',

jenkins/scripts/VersionSelectorScript.groovy

@@ -111,13 +111,15 @@ def buildExclusions = [
   [ /sharedlibs_shared/,              anyType,     lt(9)   ],
 
   // OSX ---------------------------------------------------
-  [ /osx11-release-pkg/,              releaseType, lt(16) ],
-  [ /osx11-release-tar/,              releaseType, lt(16) ],
-  [ /osx1015-release-pkg/,            releaseType, gte(16)  ],
+  [ /osx11-release-pkg/,              releaseType, lt(16)  ],
+  [ /osx11-release-tar/,              releaseType, lt(16)  ],
+  [ /osx1015-release-pkg/,            releaseType, gte(16) ],
   [ /^osx11/,                         testType,    lt(15)  ],
+  [ /osx1014/,                        anyType,     gt(16)  ],
 
   // osx1015 enabled for all up, and builds all releases to support notarization
   // osx11 only for 15+ and builds the fat binary
+  // This will need splitting into arm + x64 when the release machines move up from 10.15
 
   // FreeBSD -----------------------------------------------
   [ /^freebsd10/,                     anyType,     gte(11) ],