From 812f842509c7074d11105845f890ba12a49635e8 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Thu, 7 Nov 2024 13:19:07 +0000 Subject: [PATCH 1/3] unixPB: Dont install alpine aarch64 JDK17 bootjdk --- ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml index 06073ba261..94b9424d37 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml @@ -126,6 +126,7 @@ jdk_version: 17 when: - ansible_distribution != "Solaris" + - (ansible_distribution != "Alpine" and ansible_architecture != "aarch64") tags: build_tools - role: adoptopenjdk_install # JDK21 Build Bootstrap jdk_version: 20 From ca09662c0c9fb3241256f0c1f1a1e41913e2c4ef Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Thu, 7 Nov 2024 13:40:58 +0000 Subject: [PATCH 2/3] Remove hyphens from symlinks in bootjdks installed from Common role --- .../roles/Common/tasks/Alpine.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml index 5bcfd453af..b9c3f4f88b 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml @@ -137,10 +137,10 @@ when: - not adoptopenjdk8_installed.stat.exists -# Temp: install a non temurin binary until GA or when the jdk-11 alpine aarch64 build job becomes more stable (whichever comes first) +# Temp: install a non temurin binary until GA or when the jdk11 alpine aarch64 build job becomes more stable (whichever comes first) # https://github.com/adoptium/temurin-build/issues/2961 - - name: Check if jdk-11 is already installed in the target location - stat: path=/usr/lib/jvm/jdk-11 + - name: Check if jdk11 is already installed in the target location + stat: path=/usr/lib/jvm/jdk11 register: adoptopenjdk11_installed - name: Install java 11 from Alpine repositories @@ -150,7 +150,7 @@ - name: Create symlink to point at openjdk11 file: src: /usr/lib/jvm/java-11-openjdk - dest: /usr/lib/jvm/jdk-11 + dest: /usr/lib/jvm/jdk11 state: link when: ansible_architecture != "aarch64" and not adoptopenjdk11_installed.stat.exists @@ -177,10 +177,10 @@ # Temp. Change to GA binary once theyre available - name: Check if Temurin jdk17 is installed stat: - path: /usr/lib/jvm/jdk-17 + path: /usr/lib/jvm/jdk17 register: adoptopenjdk17_installed - - name: Install Temurin jdk-17 nightly + - name: Install Temurin jdk17 nightly unarchive: src: https://github.com/adoptium/temurin17-binaries/releases/download/jdk17u-2022-05-27-19-32-beta/OpenJDK17U-jdk_aarch64_alpine-linux_hotspot_2022-05-27-17-01.tar.gz dest: /usr/lib/jvm @@ -192,8 +192,8 @@ when: - not adoptopenjdk17_installed.stat.exists - - name: Get Temurin jdk-17 full path name - shell: set -o pipefail | ls -ld /usr/lib/jvm/jdk-17.* 2>/dev/null | awk '{print $9}' + - name: Get Temurin jdk17 full path name + shell: set -o pipefail | ls -ld /usr/lib/jvm/jdk17.* 2>/dev/null | awk '{print $9}' register: adoptopenjdk17_dir when: - not adoptopenjdk17_installed.stat.exists @@ -201,7 +201,7 @@ - name: Create symlink to major version file: src: '{{ adoptopenjdk17_dir.stdout }}' - dest: /usr/lib/jvm/jdk-17 + dest: /usr/lib/jvm/jdk17 state: link when: - not adoptopenjdk17_installed.stat.exists From 9e134542d5d9bf143994dbdd148b970453df5861 Mon Sep 17 00:00:00 2001 From: Haroon Khel Date: Thu, 7 Nov 2024 13:44:54 +0000 Subject: [PATCH 3/3] typo --- .../AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml index b9c3f4f88b..3ca25d603f 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml @@ -193,7 +193,7 @@ - not adoptopenjdk17_installed.stat.exists - name: Get Temurin jdk17 full path name - shell: set -o pipefail | ls -ld /usr/lib/jvm/jdk17.* 2>/dev/null | awk '{print $9}' + shell: set -o pipefail | ls -ld /usr/lib/jvm/jdk-17.* 2>/dev/null | awk '{print $9}' register: adoptopenjdk17_dir when: - not adoptopenjdk17_installed.stat.exists