UnixPb: Install x64 alpine bootjdks where available (#2586)

* install x64 alpine bootjdks where available * trailing spaces * add jdk 8 11 and 17 alpine linux temurin aarch64 binaries * remove alpine aarch64 condition from bootjdk roles 8 11 and 17 * trailing spaces * change aarch64 binary links * switch jdk11 back to zulu
adoptium · Jun 14, 2022 · 4e1cf66 · 4e1cf66
1 parent 5738c19
commit 4e1cf66
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 101 deletions.
diff --git a/ansible/docker/Dockerfile.Alpine3 b/ansible/docker/Dockerfile.Alpine3
@@ -14,15 +14,15 @@ RUN set -eux; \
  rm -rf /ansible; apk del ansible
 
 ENV \
-    JDK7_BOOT_DIR="/usr/lib/jvm/zulu8" \ 
-    JDK8_BOOT_DIR="/usr/lib/jvm/zulu8" \
-    JDK10_BOOT_DIR="/usr/lib/jvm/zulu11" \
-    JDK11_BOOT_DIR="/usr/lib/jvm/zulu11" \
+    JDK7_BOOT_DIR="/usr/lib/jvm/jdk8" \ 
+    JDK8_BOOT_DIR="/usr/lib/jvm/jdk8" \
+    JDK10_BOOT_DIR="/usr/lib/jvm/jdk-11" \
+    JDK11_BOOT_DIR="/usr/lib/jvm/jdk-11" \
     JDK14_BOOT_DIR="/usr/lib/jvm/zulu14" \
     JDK15_BOOT_DIR="/usr/lib/jvm/zulu15" \
     JDK16_BOOT_DIR="/usr/lib/jvm/zulu16" \
-    JDK17_BOOT_DIR="/usr/lib/jvm/zulu17" \
+    JDK17_BOOT_DIR="/usr/lib/jvm/jdk-17" \
     JDK18_BOOT_DIR="/usr/lib/jvm/zulu18" \
     JDK19_BOOT_DIR="/usr/lib/jvm/zulu18" \
     JDKLATEST_BOOT_DIR="/usr/lib/jvm/zulu18" \
-    JAVA_HOME="/usr/lib/jvm/zulu8"
+    JAVA_HOME="/usr/lib/jvm/jdk8"
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml
@@ -81,7 +81,6 @@
     - role: adoptopenjdk_install
       jdk_version: 8
       when:
-        - ansible_distribution != "Alpine"
         - ansible_architecture != "riscv64"
       tags: build_tools
     - role: adoptopenjdk_install  # JDK11 Build Bootstrap
@@ -94,7 +93,6 @@
     - role: adoptopenjdk_install
       jdk_version: 11
       when:
-        - ansible_distribution != "Alpine"
         - ansible_distribution != "Solaris"
         - ansible_architecture != "riscv64"
       tags: build_tools
@@ -115,7 +113,6 @@
     - role: adoptopenjdk_install  # JDK18 Build Bootstrap
       jdk_version: 17
       when:
-        - ansible_distribution != "Alpine"
         - ansible_distribution != "Solaris"
         - ansible_architecture != "riscv64"
       tags: build_tools

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml
@@ -50,51 +50,6 @@
         - not zulu7_installed.stat.exists
       tags: build_tools
 
-    - name: Check if zulu-8 is already installed in the target location
-      stat: path=/usr/lib/jvm/zulu8
-      register: zulu8_installed
-      tags: build_tools
-    - name: Install latest zulu-8 release if not already installed
-      unarchive:
-        src: https://cdn.azul.com/zulu/bin/zulu8.58.0.13-ca-jdk8.0.312-linux_musl_x64.tar.gz
-        dest: /usr/lib/jvm/
-        remote_src: yes
-      when:
-        - not zulu8_installed.stat.exists
-      tags: build_tools
-
-    - name: Create symlink to point at zulu-8
-      file:
-        src: /usr/lib/jvm/zulu8.58.0.13-ca-jdk8.0.312-linux_musl_x64
-        dest: /usr/lib/jvm/zulu8
-        state: link
-      when:
-        - not zulu8_installed.stat.exists
-      tags: build_tools
-
-    - name: Check if zulu-11 is already installed in the target location
-      stat: path=/usr/lib/jvm/zulu11
-      register: zulu11_installed
-      tags: build_tools
-
-    - name: Install latest zulu-11 release if not already installed
-      unarchive:
-        src: https://cdn.azul.com/zulu/bin/zulu11.54.25-ca-jdk11.0.14.1-linux_musl_x64.tar.gz
-        dest: /usr/lib/jvm/
-        remote_src: yes
-      when:
-        - not zulu11_installed.stat.exists
-      tags: build_tools
-
-    - name: Create symlink to point at zulu-11
-      file:
-        src: /usr/lib/jvm/zulu11.54.25-ca-jdk11.0.14.1-linux_musl_x64
-        dest: /usr/lib/jvm/zulu11
-        state: link
-      when:
-        - not zulu11_installed.stat.exists
-      tags: build_tools
-
     - name: Check if zulu-14 is already installed in the target location
       stat: path=/usr/lib/jvm/zulu14
       register: zulu14_installed
@@ -144,50 +99,57 @@
 - name: Install JDK for aarch64
   when: ansible_architecture == "aarch64"
   block:
-    - name: Install java 8 from Alpine repositories
-      package: "name=openjdk8 state=installed"
-      tags: build_tools
+    - name: Check if Temurin jdk8 is installed
+      stat:
+        path: /usr/lib/jvm/jdk8
+      register: adoptopenjdk8_installed
 
-    # Using zulu8 path name for compatibility with the build dockerfile
-    # ENV statements until we replace this with a Temurin 8
-    - name: Check if zulu 8 symlink is in place (TEMPORARY)
-      stat: path=/usr/lib/jvm/zulu8
-      register: zulu8_installed
-      tags: build_tools
+# Temp. Change to GA binary once theyre available
+    - name: Install Temurin jdk8 nightly
+      unarchive:
+        src: https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u-2022-05-28-05-51-beta/OpenJDK8U-jdk_aarch64_alpine-linux_hotspot_2022-05-27-18-05.tar.gz
+        dest: /usr/lib/jvm
+        remote_src: yes
+      retries: 3
+      delay: 5
+      register: adoptopenjdk_download
+      until: adoptopenjdk_download is not failed
+      when:
+        - adoptopenjdk8_installed.rc != 0
 
-    - name: Create symlink to point at openjdk8
+    - name: Get Temurin jdk8 full path name
+      shell: set -o pipefail | ls -ld /usr/lib/jvm/jdk8u.* 2>/dev/null | awk '{print $9}'
+      register: adoptopenjdk8_dir
+      when:
+        - adoptopenjdk8_installed.rc != 0
+
+    - name: Create symlink to major version
       file:
-        src: /usr/lib/jvm/java-8-openjdk
-        dest: /usr/lib/jvm/zulu8
+        src: '{{ adoptopenjdk8_dir.stdout }}'
+        dest: /usr/lib/jvm/jdk8
         state: link
       when:
-        - not zulu8_installed.stat.exists
-      tags: build_tools
+        - adoptopenjdk8_installed.rc != 0
+
+# Temp: install a non temurin binary until GA or when the jdk-11 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
+      register: adoptopenjdk11_installed
 
     - name: Install java 11 from Alpine repositories
       package: "name=openjdk11 state=installed"
-      tags: build_tools
-
-    # Using zulu11 path name for compatibility with the build dockerfile
-    # ENV statements until we replace this with a Temurin 8
-    - name: Check if zulu 11 symlink is in place (TEMPORARY)
-      stat: path=/usr/lib/jvm/zulu11
-      register: zulu11_installed
-      tags: build_tools
+      when: not adoptopenjdk11_installed.stat.exists
 
     - name: Create symlink to point at openjdk11
       file:
         src: /usr/lib/jvm/java-11-openjdk
-        dest: /usr/lib/jvm/zulu11
-        state: link
-      when:
-        - not zulu8_installed.stat.exists
-      tags: build_tools
+        dest: /usr/lib/jvm/jdk-11
+      when: not adoptopenjdk11_installed.stat.exists
 
     - name: Check if zulu-16 is already installed in the target location
       stat: path=/usr/lib/jvm/zulu16
       register: zulu16_installed
-      tags: build_tools
 
     - name: Install latest zulu-16 release if not already installed
       unarchive:
@@ -196,7 +158,6 @@
         remote_src: yes
       when:
         - not zulu16_installed.stat.exists
-      tags: build_tools
 
     - name: Create symlink to point at zulu-16
       file:
@@ -205,35 +166,42 @@
         state: link
       when:
         - not zulu16_installed.stat.exists
-      tags: build_tools
 
-    - name: Check if zulu-17 is already installed in the target location
-      stat: path=/usr/lib/jvm/zulu17
-      register: zulu17_installed
-      tags: build_tools
+# Temp. Change to GA binary once theyre available
+    - name: Check if Temurin jdk17 is installed
+      stat:
+        path: /usr/lib/jvm/jdk-17
+      register: adoptopenjdk17_installed
 
-    - name: Install latest zulu-17 release if not already installed
+    - name: Install Temurin jdk-17 nightly
       unarchive:
-        src: https://cdn.azul.com/zulu/bin/zulu17.32.13-ca-jdk17.0.2-linux_musl_aarch64.tar.gz
-        dest: /usr/lib/jvm/
+        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
         remote_src: yes
+      retries: 3
+      delay: 5
+      register: adoptopenjdk_download
+      until: adoptopenjdk_download is not failed
       when:
-        - not zulu17_installed.stat.exists
-      tags: build_tools
+        - adoptopenjdk17_installed.rc != 0
 
-    - name: Create symlink to point at zulu-17
+    - 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}'
+      register: adoptopenjdk17_dir
+      when:
+        - adoptopenjdk17_installed.rc != 0
+
+    - name: Create symlink to major version
       file:
-        src: /usr/lib/jvm/zulu17.32.13-ca-jdk17.0.2-linux_musl_aarch64
-        dest: /usr/lib/jvm/zulu17
+        src: '{{ adoptopenjdk17_dir.stdout }}'
+        dest: /usr/lib/jvm/jdk-17
         state: link
       when:
-        - not zulu17_installed.stat.exists
-      tags: build_tools
+        - adoptopenjdk17_installed.rc != 0
 
     - name: Check if zulu-18 is already installed in the target location
       stat: path=/usr/lib/jvm/zulu18
       register: zulu18_installed
-      tags: build_tools
 
     - name: Install latest zulu-18 release if not already installed
       unarchive:
@@ -242,7 +210,6 @@
         remote_src: yes
       when:
         - not zulu18_installed.stat.exists
-      tags: build_tools
 
     - name: Create symlink to point at zulu-18
       file:
@@ -251,4 +218,4 @@
         state: link
       when:
         - not zulu18_installed.stat.exists
-      tags: build_tools
+  tags: build_tools
diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adoptopenjdk_install/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adoptopenjdk_install/tasks/main.yml
@@ -131,6 +131,20 @@
     - adoptopenjdk_installed.rc != 0
   tags: adoptopenjdk_install
 
+- name: Install latest release if one not already installed (alpine-linux)
+  unarchive:
+    src: https://api.adoptopenjdk.net/v3/binary/latest/{{ jdk_version }}/ga/alpine-linux/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk
+    dest: /usr/lib/jvm
+    remote_src: yes
+  retries: 3
+  delay: 5
+  register: adoptopenjdk_download
+  until: adoptopenjdk_download is not failed
+  when:
+    - ansible_distribution == "Alpine"
+    - adoptopenjdk_installed.rc != 0
+  tags: adoptopenjdk_install
+
 # CentOS6 needs it's own task so it can use a different python interpreter.
 # See: https://github.com/adoptium/infrastructure/issues/1877
 - name: Install latest release if not already installed (CentOS6)