From 86235552f41058f1b0e5f33f66403ec3ee7fea49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= <targos@protonmail.com>
Date: Wed, 23 Nov 2022 15:04:29 +0100
Subject: [PATCH] ansible: install temurin JDK on macOS (#3085)

Refs: https://github.com/nodejs/build/issues/3030
---
 ansible/roles/java-base/tasks/main.yml        | 23 ++-----------------
 ansible/roles/java-base/vars/main.yml         |  2 +-
 ansible/roles/jenkins-worker/vars/main.yml    |  3 +--
 .../package-upgrade/tasks/partials/brew.yml   |  7 +++---
 4 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/ansible/roles/java-base/tasks/main.yml b/ansible/roles/java-base/tasks/main.yml
index c5e362919..be9a02a99 100644
--- a/ansible/roles/java-base/tasks/main.yml
+++ b/ansible/roles/java-base/tasks/main.yml
@@ -51,32 +51,13 @@
     # Package manager mapping in ansible/roles/package-upgrade/vars/main.yml.
     use: "{{ os|match_key(pm)|default(omit) }}"
 
-- name: install java tap (macOS)
-  become_user: administrator
-  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("macos") and arch == "x64"
+  become_user: "{{ ansible_user }}"
+  when: java.rc > 0 and os|startswith("macos")
   homebrew_cask:
         name: "{{ java_package_name }}"
         state: present
 
-- name: Fetch java (Apple Silicon)
-  when: java.rc > 0 and os|startswith("macos11") and arch == "arm64"
-  shell:
-    chdir: "/Users/{{ ansible_user }}"
-    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: java.rc > 0 and os|startswith("macos11") and arch == "arm64"
-  shell:
-    chdir: "/Users/{{ ansible_user }}"
-    cmd: "tar -xf zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64.tar.gz"
-
 - name: install webupd8 oracle java 8 extras
   when: java.rc > 0 and os == "ubuntu1404" and arch != "ppc64"
   package: name="{{item}}" state=present
diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml
index b86f176da..a0cd2d9b5 100644
--- a/ansible/roles/java-base/vars/main.yml
+++ b/ansible/roles/java-base/vars/main.yml
@@ -14,7 +14,7 @@ packages: {
   'fedora32': 'java-11-openjdk-headless',
   'freebsd': 'openjdk11-jre',
   'ibmi': 'openjdk-11-ea',
-  'macos': 'adoptopenjdk8',
+  'macos': 'temurin17',
   'rhel7': 'java-11-openjdk',
   'rhel8': 'java-17-openjdk',
   'smartos': 'openjdk8',
diff --git a/ansible/roles/jenkins-worker/vars/main.yml b/ansible/roles/jenkins-worker/vars/main.yml
index 94fe7c8ea..09bba7995 100644
--- a/ansible/roles/jenkins-worker/vars/main.yml
+++ b/ansible/roles/jenkins-worker/vars/main.yml
@@ -86,8 +86,7 @@ java_path: {
   'macos10.14': 'java',
   'macos10.15': 'java',
   'macos11': 'java',
-  # Currently hardcoded untill adopt have their build available
-  'macos11.0': '/Users/{{ ansible_user }}/zulu8.52.0.23-ca-jdk8.0.282-macosx_aarch64/bin/java',
+  'macos11.0': 'java',
   'smartos15': '/opt/local/java/openjdk8/bin/java',
   'smartos16': '/opt/local/java/openjdk8/bin/java',
   'smartos17': '/opt/local/java/openjdk8/bin/java',
diff --git a/ansible/roles/package-upgrade/tasks/partials/brew.yml b/ansible/roles/package-upgrade/tasks/partials/brew.yml
index e86fc4410..eafec4f0e 100644
--- a/ansible/roles/package-upgrade/tasks/partials/brew.yml
+++ b/ansible/roles/package-upgrade/tasks/partials/brew.yml
@@ -8,12 +8,13 @@
     raw: xcode-select --print-path &> /dev/null
     register: xcode
     ignore_errors: yes
+    check_mode: no
 
   - name: Install xcode-tools
     script: files/install-xcode.sh
     when: xcode.rc > 1
 
-  - name: Check if Homebrew is already installed (Apple Sillicon)
+  - name: Check if Homebrew is already installed (Apple Silicon)
     stat:
       path: /opt/homebrew/bin/brew
     register: armbrew
@@ -45,10 +46,10 @@
     homebrew_tap:
       name: buo/cask-upgrade
 
-  - name: Add AdoptOpenJDK Java Repo
+  - name: Install brew cask-versions
     become_user: "{{ ansible_user }}"
     homebrew_tap:
-      name: AdoptOpenJDK/openjdk
+      name: homebrew/cask-versions
 
   - name: Update Casks
     become_user: "{{ ansible_user }}"