Skip to content

Commit

Permalink
unixPB: Dont install GA JDK17 bootjdk on alpine aarch64 (adoptium#3805)
Browse files Browse the repository at this point in the history
* unixPB: Dont install alpine aarch64 JDK17 bootjdk

* Remove hyphens from symlinks in bootjdks installed from Common role

* typo
  • Loading branch information
Haroon-Khel authored and mahdipub committed Dec 5, 2024
1 parent 0f6e8f7 commit 00aecbd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand All @@ -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
Expand All @@ -192,7 +192,7 @@
when:
- not adoptopenjdk17_installed.stat.exists

- name: Get Temurin jdk-17 full path name
- name: Get Temurin jdk17 full path name
shell: set -o pipefail | ls -ld /usr/lib/jvm/jdk-17.* 2>/dev/null | awk '{print $9}'
register: adoptopenjdk17_dir
when:
Expand All @@ -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
Expand Down

0 comments on commit 00aecbd

Please sign in to comment.