From bb4d436b1489f93491653155cce6a8963fc79ec2 Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Tue, 12 Sep 2023 17:28:18 +0100
Subject: [PATCH 01/11] add intel homebrew install for m1 macs

---
 .../AdoptOpenJDK_Unix_Playbook/main.yml       |  3 +++
 .../roles/Homebrew_intel/tasks/main.yml       | 24 +++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
index 7ac31394a2..6d17ce08b4 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
@@ -75,6 +75,9 @@
     - role: Xcode
       when: ansible_distribution == "MacOSX"
       tags: [build_tools, xcode, adoptopenjdk]
+    - role: Homebrew_intel
+      when: ansible_distribution == "MacOSX" and ansible_architecture == "arm64"
+      tags: [build_tools, homebrew_intel]
     - role: cmake                 # OpenJ9 / OpenJFX
       when: ansible_distribution != "Solaris" # Compile fails on Solaris
       tags: [build_tools, build_tools_openj9, build_tools_openjfx]
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml
new file mode 100644
index 0000000000..e6c12ba402
--- /dev/null
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml
@@ -0,0 +1,24 @@
+---
+# Install Intel Homebrew onto our arm64 mac machines. This is needed to build x64 jdk8:
+# The freetype build process requires Intel libpng installed, which needs Intel Homebrew
+
+- name: Check if Intel Homebrew is installed
+  stat:
+    path: /usr/local/Homebrew/bin/brew
+  register: intel_homebrew_installed
+
+- name: Run Homebrew install script in a Rosetta shell
+  ansible.builtin.shell: arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+  when: not intel_homebrew_installed.exists
+
+- name: (debug) Check if install was successful
+  stat:
+    path: /usr/local/Homebrew/bin/brew
+  register: debug_intel_homebrew_installed
+
+- name: (debug) print debug_intel_homebrew_installed 
+  debug:
+    msg: "{{ debug_intel_homebrew_installed }}"
+
+- name: Install Intel libpng
+  ansible.builtin.shell: arch -x86_64 yes | /usr/local/Homebrew/bin/brew install libpng
\ No newline at end of file

From b4d9d52524e6246713fad1cdab62ae23a81221cc Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Tue, 12 Sep 2023 17:30:42 +0100
Subject: [PATCH 02/11] remove spaces

---
 .../roles/Homebrew_intel/tasks/main.yml                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml
index e6c12ba402..c38e7ac159 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml
@@ -16,9 +16,9 @@
     path: /usr/local/Homebrew/bin/brew
   register: debug_intel_homebrew_installed
 
-- name: (debug) print debug_intel_homebrew_installed 
+- name: (debug) print debug_intel_homebrew_installed
   debug:
     msg: "{{ debug_intel_homebrew_installed }}"
 
 - name: Install Intel libpng
-  ansible.builtin.shell: arch -x86_64 yes | /usr/local/Homebrew/bin/brew install libpng
\ No newline at end of file
+  ansible.builtin.shell: arch -x86_64 yes | /usr/local/Homebrew/bin/brew install libpng

From 88b3be3a889f4c697019bfd9b4b4c40612ec09d1 Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Wed, 13 Sep 2023 14:22:05 +0100
Subject: [PATCH 03/11] add brew path to brew ansible modules

---
 .../roles/Common/tasks/MacOSX.yml                | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
index 5ee080d541..1102064dd0 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
@@ -25,12 +25,12 @@
 
 - name: Set homebrew path (x64)
   set_fact:
-    homebrew_path: /usr/local/bin/brew
+    homebrew_path: /usr/local/bin
   when: ansible_architecture == "x86_64"
 
 - name: Set homebrew path (Arm64)
   set_fact:
-    homebrew_path: /opt/homebrew/bin/brew
+    homebrew_path: /opt/homebrew/bin
   when: ansible_architecture == "arm64"
 
 - name: Configure system-wide Bash profile
@@ -67,7 +67,7 @@
 
 - name: Check if Homebrew is already installed
   stat:
-    path: "{{ homebrew_path }}"
+    path: "{{ homebrew_path }}/brew"
   register: brew
 
 - name: Install Homebrew
@@ -81,6 +81,7 @@
   become_user: "{{ ansible_user }}"
   homebrew:
     upgrade_all: yes
+    path: "{{ homebrew_path }}"
   when: "macos_version_number is version('10.15', '>')"
   tags:
     - brew_upgrade
@@ -90,6 +91,7 @@
   become_user: "{{ ansible_user }}"
   homebrew_tap:
     name: buo/cask-upgrade
+    path: "{{ homebrew_path }}"
   tags:
     - brew_cu
 
@@ -98,12 +100,13 @@
   become_user: "{{ ansible_user }}"
   homebrew_tap:
     name: AdoptOpenJDK/openjdk
+    path: "{{ homebrew_path }}"
 
 # Skipping linting as no situation where this can't run (lint error 301)
 - name: Update Casks
   become: yes
   become_user: "{{ ansible_user }}"
-  command: "{{ homebrew_path }} cu -y"
+  command: "{{ homebrew_path }}/brew cu -y"
   tags:
     - brew_cu
     - skip_ansible_lint
@@ -112,6 +115,7 @@
   become: yes
   become_user: "{{ ansible_user }}"
   homebrew: "name={{ item }} state=present"
+    path: "{{ homebrew_path }}"
   with_items: "{{ Build_Tool_Packages }}"
   tags: build_tools
 
@@ -119,6 +123,7 @@
   become: yes
   become_user: "{{ ansible_user }}"
   homebrew: "name={{ item }} state=present"
+    path: "{{ homebrew_path }}"
   with_items: "{{ Build_Tool_Packages_NOT_10_12 }}"
   when:
     - not (macos_version_number | regex_search("10.12"))
@@ -128,6 +133,7 @@
   become: yes
   become_user: "{{ ansible_user }}"
   homebrew_cask: "name={{ item }} state=present"
+    path: "{{ homebrew_path }}"
   with_items: "{{ Build_Tool_Casks }}"
   tags: build_tools
 
@@ -135,6 +141,7 @@
   become: yes
   become_user: "{{ ansible_user }}"
   homebrew: "name={{ item }} state=present"
+    path: "{{ homebrew_path }}"
   with_items: "{{ Test_Tool_Packages }}"
   tags: test_tools
 
@@ -142,6 +149,7 @@
   become: yes
   become_user: "{{ ansible_user }}"
   homebrew_cask: "name={{ item }} state=present"
+    path: "{{ homebrew_path }}"
   with_items: "{{ JCK_Tool_Casks }}"
   tags: jck_tools
 

From 4495045094b5d1cdc5468c9bd83c4c6e81e19744 Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Wed, 13 Sep 2023 14:57:53 +0100
Subject: [PATCH 04/11] change formatting of module parameters

---
 .../roles/Common/tasks/MacOSX.yml             | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
index 1102064dd0..4df984e68e 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
@@ -114,7 +114,9 @@
 - name: Install Build Tool Packages
   become: yes
   become_user: "{{ ansible_user }}"
-  homebrew: "name={{ item }} state=present"
+  homebrew:
+    name: "{{ item }}"
+    state: present
     path: "{{ homebrew_path }}"
   with_items: "{{ Build_Tool_Packages }}"
   tags: build_tools
@@ -122,7 +124,9 @@
 - name: Install Build Tool Packages NOT macOS 10.12
   become: yes
   become_user: "{{ ansible_user }}"
-  homebrew: "name={{ item }} state=present"
+  homebrew:
+    name: "{{ item }}"
+    state: present"
     path: "{{ homebrew_path }}"
   with_items: "{{ Build_Tool_Packages_NOT_10_12 }}"
   when:
@@ -132,7 +136,9 @@
 - name: Install Build Tool Casks
   become: yes
   become_user: "{{ ansible_user }}"
-  homebrew_cask: "name={{ item }} state=present"
+  homebrew_cask:
+    name: "{{ item }}"
+    state: present
     path: "{{ homebrew_path }}"
   with_items: "{{ Build_Tool_Casks }}"
   tags: build_tools
@@ -140,7 +146,9 @@
 - name: Install Test Tool Packages
   become: yes
   become_user: "{{ ansible_user }}"
-  homebrew: "name={{ item }} state=present"
+  homebrew:
+    name: "{{ item }}"
+    state: present
     path: "{{ homebrew_path }}"
   with_items: "{{ Test_Tool_Packages }}"
   tags: test_tools
@@ -148,7 +156,9 @@
 - name: Install JCK Tool Casks
   become: yes
   become_user: "{{ ansible_user }}"
-  homebrew_cask: "name={{ item }} state=present"
+  homebrew_cask:
+    name: "{{ item }}"
+    state: present
     path: "{{ homebrew_path }}"
   with_items: "{{ JCK_Tool_Casks }}"
   tags: jck_tools

From 5eac13f42bc269873f5fd833504fbd332827b0cc Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Wed, 13 Sep 2023 15:12:36 +0100
Subject: [PATCH 05/11] typo

---
 .../AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
index 4df984e68e..966789f687 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
@@ -126,7 +126,7 @@
   become_user: "{{ ansible_user }}"
   homebrew:
     name: "{{ item }}"
-    state: present"
+    state: present
     path: "{{ homebrew_path }}"
   with_items: "{{ Build_Tool_Packages_NOT_10_12 }}"
   when:

From e30c851cba9d1bc824e8f6196940e6f7191441d8 Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Wed, 13 Sep 2023 17:41:57 +0100
Subject: [PATCH 06/11] remove debug tasks

---
 .../roles/Homebrew_intel/tasks/main.yml             | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml
index c38e7ac159..1863769050 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml
@@ -8,17 +8,8 @@
   register: intel_homebrew_installed
 
 - name: Run Homebrew install script in a Rosetta shell
-  ansible.builtin.shell: arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-  when: not intel_homebrew_installed.exists
-
-- name: (debug) Check if install was successful
-  stat:
-    path: /usr/local/Homebrew/bin/brew
-  register: debug_intel_homebrew_installed
-
-- name: (debug) print debug_intel_homebrew_installed
-  debug:
-    msg: "{{ debug_intel_homebrew_installed }}"
+  ansible.builtin.shell: yes | arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+  when: not intel_homebrew_installed.stat.exists
 
 - name: Install Intel libpng
   ansible.builtin.shell: arch -x86_64 yes | /usr/local/Homebrew/bin/brew install libpng

From 5edeebf778ddfa44a2744a257c9f2745cb5d5bd1 Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Wed, 13 Sep 2023 17:50:12 +0100
Subject: [PATCH 07/11] add comment

---
 .../roles/Homebrew_intel/tasks/main.yml                        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml
index 1863769050..ff2452d8c6 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml
@@ -1,6 +1,7 @@
 ---
-# Install Intel Homebrew onto our arm64 mac machines. This is needed to build x64 jdk8:
+# Install Intel Homebrew onto our arm64 mac machines. This is needed to build x64 jdk8
 # The freetype build process requires Intel libpng installed, which needs Intel Homebrew
+# See https://github.com/adoptium/infrastructure/issues/2536#issuecomment-1708716478
 
 - name: Check if Intel Homebrew is installed
   stat:

From b3ef1edb688f5d49645a7437d8d41f86f590e43a Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Thu, 14 Sep 2023 17:40:48 +0100
Subject: [PATCH 08/11] specify homebrew path

---
 .../roles/Nagios_Plugins/tasks/nagios_MacOSX.yml | 16 +++++++++++++++-
 .../roles/Xcode/tasks/main.yml                   | 11 +++++++++++
 .../roles/curl/tasks/main.yml                    | 11 +++++++++++
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Plugins/tasks/nagios_MacOSX.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Plugins/tasks/nagios_MacOSX.yml
index 18da3d34b1..f35cd355a3 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Plugins/tasks/nagios_MacOSX.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Plugins/tasks/nagios_MacOSX.yml
@@ -6,8 +6,22 @@
 ########################################
 # Install Nagios dependencies packages #
 ########################################
+
+- name: Set Mac homebrew path (x64)
+  set_fact:
+    homebrew_path: /usr/local/bin
+  when: ansible_distribution == "MacOSX" ansible_architecture == "x86_64"
+
+- name: Set Mac homebrew path (Arm64)
+  set_fact:
+    homebrew_path: /opt/homebrew/bin
+  when: ansible_distribution == "MacOSX" and ansible_architecture == "arm64"
+
 - name: Install additional packages used by Nagios
-  homebrew: "name={{ item }} state=present"
+  homebrew:
+    name: "{{ item }}"
+    state: present
+    path: "{{ homebrew_path }}"
   become: yes
   become_user: "{{ ansible_user }}"
   with_items:
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Xcode/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Xcode/tasks/main.yml
index 6bae45d566..40f1063acc 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Xcode/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Xcode/tasks/main.yml
@@ -20,6 +20,16 @@
           Ensure that Apple_ID_User, Apple_ID_Password and FASTLANE_SESSION are defined. Skipping Xcode installation"
   when: apple_variables is not defined
 
+- name: Set Mac homebrew path (x64)
+  set_fact:
+    homebrew_path: /usr/local/bin
+  when: ansible_distribution == "MacOSX" ansible_architecture == "x86_64"
+
+- name: Set Mac homebrew path (Arm64)
+  set_fact:
+    homebrew_path: /opt/homebrew/bin
+  when: ansible_distribution == "MacOSX" and ansible_architecture == "arm64"
+
 - name: Install Xcode
   when: apple_variables is defined
   block:
@@ -29,6 +39,7 @@
       homebrew:
         name: ruby@2.7 # no 3.0 yet for fastlane (https://github.com/fastlane/fastlane/issues/17931)
         state: present
+        path: "{{ homebrew_path }}"
 
     - name: Configure Bash profile extension for Ruby
       become: yes
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/curl/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/curl/tasks/main.yml
index 5691b9450d..5c2cb81df8 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/curl/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/curl/tasks/main.yml
@@ -27,6 +27,16 @@
     curl_latest: 7.79.1
   tags: curl
 
+- name: Set Mac homebrew path (x64)
+  set_fact:
+    homebrew_path: /usr/local/bin
+  when: ansible_distribution == "MacOSX" ansible_architecture == "x86_64"
+
+- name: Set Mac homebrew path (Arm64)
+  set_fact:
+    homebrew_path: /opt/homebrew/bin
+  when: ansible_distribution == "MacOSX" and ansible_architecture == "arm64"
+
 - name: Download curl {{ curl_latest }}
   get_url:
     url: https://github.com/curl/curl/releases/download/curl-7_79_1/curl-{{ curl_latest }}.tar.gz
@@ -114,6 +124,7 @@
   homebrew:
     name: curl
     state: latest
+    path: "{{ homebrew_path }}"
   when:
     - ansible_distribution == "MacOSX"
     - "macos_version_number is version('10.13', '>')"

From 1c59d667a09502544fb4b777428c7582e8ba9cd2 Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Thu, 14 Sep 2023 18:07:16 +0100
Subject: [PATCH 09/11] correct conditions

---
 .../roles/Nagios_Plugins/tasks/nagios_MacOSX.yml              | 4 ++--
 .../AdoptOpenJDK_Unix_Playbook/roles/Xcode/tasks/main.yml     | 4 ++--
 .../AdoptOpenJDK_Unix_Playbook/roles/curl/tasks/main.yml      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Plugins/tasks/nagios_MacOSX.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Plugins/tasks/nagios_MacOSX.yml
index f35cd355a3..b6553498be 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Plugins/tasks/nagios_MacOSX.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Nagios_Plugins/tasks/nagios_MacOSX.yml
@@ -10,12 +10,12 @@
 - name: Set Mac homebrew path (x64)
   set_fact:
     homebrew_path: /usr/local/bin
-  when: ansible_distribution == "MacOSX" ansible_architecture == "x86_64"
+  when: ansible_architecture == "x86_64"
 
 - name: Set Mac homebrew path (Arm64)
   set_fact:
     homebrew_path: /opt/homebrew/bin
-  when: ansible_distribution == "MacOSX" and ansible_architecture == "arm64"
+  when: ansible_architecture == "arm64"
 
 - name: Install additional packages used by Nagios
   homebrew:
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Xcode/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Xcode/tasks/main.yml
index 40f1063acc..5f390c0983 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Xcode/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Xcode/tasks/main.yml
@@ -23,12 +23,12 @@
 - name: Set Mac homebrew path (x64)
   set_fact:
     homebrew_path: /usr/local/bin
-  when: ansible_distribution == "MacOSX" ansible_architecture == "x86_64"
+  when: ansible_architecture == "x86_64"
 
 - name: Set Mac homebrew path (Arm64)
   set_fact:
     homebrew_path: /opt/homebrew/bin
-  when: ansible_distribution == "MacOSX" and ansible_architecture == "arm64"
+  when: ansible_architecture == "arm64"
 
 - name: Install Xcode
   when: apple_variables is defined
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/curl/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/curl/tasks/main.yml
index 5c2cb81df8..0f82f6e611 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/curl/tasks/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/curl/tasks/main.yml
@@ -30,7 +30,7 @@
 - name: Set Mac homebrew path (x64)
   set_fact:
     homebrew_path: /usr/local/bin
-  when: ansible_distribution == "MacOSX" ansible_architecture == "x86_64"
+  when: ansible_distribution == "MacOSX" and ansible_architecture == "x86_64"
 
 - name: Set Mac homebrew path (Arm64)
   set_fact:

From 962e87265761414422f0e91b9f53f064cbc0c70c Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Thu, 2 Nov 2023 15:53:32 +0000
Subject: [PATCH 10/11] remove intel homebrew, uninstall libpng

---
 .../AdoptOpenJDK_Unix_Playbook/main.yml          |  3 ---
 .../roles/Common/tasks/MacOSX.yml                |  8 ++++++++
 .../roles/Homebrew_intel/tasks/main.yml          | 16 ----------------
 3 files changed, 8 insertions(+), 19 deletions(-)
 delete mode 100644 ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
index 6d17ce08b4..7ac31394a2 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
@@ -75,9 +75,6 @@
     - role: Xcode
       when: ansible_distribution == "MacOSX"
       tags: [build_tools, xcode, adoptopenjdk]
-    - role: Homebrew_intel
-      when: ansible_distribution == "MacOSX" and ansible_architecture == "arm64"
-      tags: [build_tools, homebrew_intel]
     - role: cmake                 # OpenJ9 / OpenJFX
       when: ansible_distribution != "Solaris" # Compile fails on Solaris
       tags: [build_tools, build_tools_openj9, build_tools_openjfx]
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
index 966789f687..1301580bb3 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
@@ -180,6 +180,14 @@
   when: not pdfwriter.stat.exists
   tags: jck_tools
 
+- name: Uninstall libpng
+  become: yes
+  become_user: "{{ ansible_user }}"
+  homebrew:
+    name: libpng
+    state: absent
+    path: "{{ homebrew_path }}"
+
 # As per https://github.com/eclipse/openj9/issues/3790
 - name: Creating /etc/sysctl.conf for kernel tunings
   file:
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml
deleted file mode 100644
index ff2452d8c6..0000000000
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Homebrew_intel/tasks/main.yml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-# Install Intel Homebrew onto our arm64 mac machines. This is needed to build x64 jdk8
-# The freetype build process requires Intel libpng installed, which needs Intel Homebrew
-# See https://github.com/adoptium/infrastructure/issues/2536#issuecomment-1708716478
-
-- name: Check if Intel Homebrew is installed
-  stat:
-    path: /usr/local/Homebrew/bin/brew
-  register: intel_homebrew_installed
-
-- name: Run Homebrew install script in a Rosetta shell
-  ansible.builtin.shell: yes | arch -x86_64 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-  when: not intel_homebrew_installed.stat.exists
-
-- name: Install Intel libpng
-  ansible.builtin.shell: arch -x86_64 yes | /usr/local/Homebrew/bin/brew install libpng

From 60eef7b8f7c3fc6f43d1ae929cdcb0aeab433749 Mon Sep 17 00:00:00 2001
From: Haroon Khel <hkhel@redhat.com>
Date: Mon, 6 Nov 2023 13:04:31 +0000
Subject: [PATCH 11/11] add adoptopenjdk tag to libpng uninstall

---
 .../AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
index 1301580bb3..033adc23a1 100644
--- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
+++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/MacOSX.yml
@@ -187,6 +187,7 @@
     name: libpng
     state: absent
     path: "{{ homebrew_path }}"
+  tags: adoptopenjdk
 
 # As per https://github.com/eclipse/openj9/issues/3790
 - name: Creating /etc/sysctl.conf for kernel tunings