From 337d2fc486c58bba2cd0347e304b773839586cf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Sun, 20 Nov 2022 12:09:48 +0100 Subject: [PATCH 1/5] ansible: install temurin JDK on macOS Refs: https://github.com/nodejs/build/issues/3030 --- ansible/roles/java-base/tasks/main.yml | 21 +------------------ ansible/roles/java-base/vars/main.yml | 2 +- ansible/roles/jenkins-worker/vars/main.yml | 3 +-- .../package-upgrade/tasks/partials/brew.yml | 2 +- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/ansible/roles/java-base/tasks/main.yml b/ansible/roles/java-base/tasks/main.yml index c5e362919..a4b8e214a 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" + 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 650df1ec7..1541abc1e 100644 --- a/ansible/roles/java-base/vars/main.yml +++ b/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', - 'macos': 'adoptopenjdk8', + 'macos': 'temurin', '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 97c834dce..c8f600be7 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..08bd8564f 100644 --- a/ansible/roles/package-upgrade/tasks/partials/brew.yml +++ b/ansible/roles/package-upgrade/tasks/partials/brew.yml @@ -13,7 +13,7 @@ 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 From 322e87872837938fac4e71caa776d3a5168b0654 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 22 Nov 2022 09:56:26 +0100 Subject: [PATCH 2/5] remove AdoptOpenJDK repo --- ansible/roles/package-upgrade/tasks/partials/brew.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/ansible/roles/package-upgrade/tasks/partials/brew.yml b/ansible/roles/package-upgrade/tasks/partials/brew.yml index 08bd8564f..d38c01fa8 100644 --- a/ansible/roles/package-upgrade/tasks/partials/brew.yml +++ b/ansible/roles/package-upgrade/tasks/partials/brew.yml @@ -8,6 +8,7 @@ raw: xcode-select --print-path &> /dev/null register: xcode ignore_errors: yes + check_mode: no - name: Install xcode-tools script: files/install-xcode.sh @@ -45,11 +46,6 @@ homebrew_tap: name: buo/cask-upgrade - - name: Add AdoptOpenJDK Java Repo - become_user: "{{ ansible_user }}" - homebrew_tap: - name: AdoptOpenJDK/openjdk - - name: Update Casks become_user: "{{ ansible_user }}" homebrew_cask: From eab2352f492cadbfb2da47a8f78cf09fb6339161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Tue, 22 Nov 2022 15:16:46 +0100 Subject: [PATCH 3/5] temurin17 --- ansible/roles/java-base/tasks/main.yml | 2 +- ansible/roles/java-base/vars/main.yml | 2 +- ansible/roles/package-upgrade/tasks/partials/brew.yml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ansible/roles/java-base/tasks/main.yml b/ansible/roles/java-base/tasks/main.yml index a4b8e214a..be9a02a99 100644 --- a/ansible/roles/java-base/tasks/main.yml +++ b/ansible/roles/java-base/tasks/main.yml @@ -52,7 +52,7 @@ use: "{{ os|match_key(pm)|default(omit) }}" - name: install java (macOS) - become_user: administrator + become_user: "{{ ansible_user }}" when: java.rc > 0 and os|startswith("macos") homebrew_cask: name: "{{ java_package_name }}" diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml index 1541abc1e..951486889 100644 --- a/ansible/roles/java-base/vars/main.yml +++ b/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', - 'macos': 'temurin', + 'macos': 'temurin17', 'rhel7': 'java-11-openjdk', 'rhel8': 'java-17-openjdk', 'smartos': 'openjdk8', diff --git a/ansible/roles/package-upgrade/tasks/partials/brew.yml b/ansible/roles/package-upgrade/tasks/partials/brew.yml index d38c01fa8..22cc8fb91 100644 --- a/ansible/roles/package-upgrade/tasks/partials/brew.yml +++ b/ansible/roles/package-upgrade/tasks/partials/brew.yml @@ -45,6 +45,11 @@ become_user: "{{ ansible_user }}" homebrew_tap: name: buo/cask-upgrade + + - name: Install brew cask-versions + become_user: "{{ ansible_user }}" + homebrew_tap: + name: homebrew/cask-versions - name: Update Casks become_user: "{{ ansible_user }}" From 7ff9551e625ed40a7e33eebf3ee3a0a18d9bb7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Wed, 23 Nov 2022 13:57:58 +0100 Subject: [PATCH 4/5] remove whitespaces --- ansible/roles/package-upgrade/tasks/partials/brew.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/roles/package-upgrade/tasks/partials/brew.yml b/ansible/roles/package-upgrade/tasks/partials/brew.yml index 22cc8fb91..68ada6511 100644 --- a/ansible/roles/package-upgrade/tasks/partials/brew.yml +++ b/ansible/roles/package-upgrade/tasks/partials/brew.yml @@ -45,7 +45,6 @@ become_user: "{{ ansible_user }}" homebrew_tap: name: buo/cask-upgrade - - name: Install brew cask-versions become_user: "{{ ansible_user }}" homebrew_tap: From c94b528f4b18972765edcc99c399dcb3c710bbb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Wed, 23 Nov 2022 13:59:13 +0100 Subject: [PATCH 5/5] add newline --- ansible/roles/package-upgrade/tasks/partials/brew.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/roles/package-upgrade/tasks/partials/brew.yml b/ansible/roles/package-upgrade/tasks/partials/brew.yml index 68ada6511..eafec4f0e 100644 --- a/ansible/roles/package-upgrade/tasks/partials/brew.yml +++ b/ansible/roles/package-upgrade/tasks/partials/brew.yml @@ -45,6 +45,7 @@ become_user: "{{ ansible_user }}" homebrew_tap: name: buo/cask-upgrade + - name: Install brew cask-versions become_user: "{{ ansible_user }}" homebrew_tap: