unixPb: Remove hyphen from Bootjdk symlinks (#3773)

* unixPb: Remove hyphen from Bootjdk symlinks * remove hyphen from windows bootjdk symlinks * Use hyphenated path when looking for unzipped binary * Find the jdk directory using find module * Update regex for JDK path search * Revert changes on windows
adoptium · Nov 6, 2024 · 8803a16 · 8803a16
1 parent 822366e
commit 8803a16
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 37 deletions.
diff --git a/ansible/docker/Dockerfile.Alpine3 b/ansible/docker/Dockerfile.Alpine3
@@ -18,12 +18,12 @@ RUN set -eux; \
 ENV \
     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" \
+    JDK10_BOOT_DIR="/usr/lib/jvm/jdk11" \
+    JDK11_BOOT_DIR="/usr/lib/jvm/jdk11" \
     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/jdk-17" \
+    JDK17_BOOT_DIR="/usr/lib/jvm/jdk17" \
     JDK18_BOOT_DIR="/usr/lib/jvm/zulu18" \
     JDKLATEST_BOOT_DIR="/usr/lib/jvm/zulu18" \
     JAVA_HOME="/usr/lib/jvm/jdk8"
diff --git a/ansible/docker/Dockerfile.CentOS6 b/ansible/docker/Dockerfile.CentOS6
@@ -27,9 +27,9 @@ RUN useradd -c "Jenkins user" -d /home/${user} -u 1000 -g 1000 -m ${user}
 ENV \
     JDK7_BOOT_DIR="/usr/lib/jvm/java-1.7.0-openjdk.x86_64" \
     JDK8_BOOT_DIR="/usr/lib/jvm/java-1.8.0-openjdk.x86_64" \
-    JDK10_BOOT_DIR="/usr/lib/jvm/jdk-10" \
-    JDK11_BOOT_DIR="/usr/lib/jvm/jdk-11" \
-    JDK13_BOOT_DIR="/usr/lib/jvm/jdk-13" \
-    JDK14_BOOT_DIR="/usr/lib/jvm/jdk-14" \
-    JDKLATEST_BOOT_DIR="/usr/lib/jvm/jdk-14" \
+    JDK10_BOOT_DIR="/usr/lib/jvm/jdk10" \
+    JDK11_BOOT_DIR="/usr/lib/jvm/jdk11" \
+    JDK13_BOOT_DIR="/usr/lib/jvm/jdk13" \
+    JDK14_BOOT_DIR="/usr/lib/jvm/jdk14" \
+    JDKLATEST_BOOT_DIR="/usr/lib/jvm/jdk14" \
     JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk.x86_64"
diff --git a/ansible/docker/Dockerfile.CentOS7 b/ansible/docker/Dockerfile.CentOS7
@@ -33,9 +33,9 @@ RUN useradd -c "Jenkins user" -d /home/${user} -u 1000 -g 1000 -m ${user}
 ENV \
     JDK7_BOOT_DIR="/usr/lib/jvm/java-1.7.0-openjdk" \
     JDK8_BOOT_DIR="/usr/lib/jvm/java-1.8.0-openjdk" \
-    JDK10_BOOT_DIR="/usr/lib/jvm/jdk-10" \
-    JDK11_BOOT_DIR="/usr/lib/jvm/jdk-11" \
-    JDK13_BOOT_DIR="/usr/lib/jvm/jdk-13" \
-    JDK14_BOOT_DIR="/usr/lib/jvm/jdk-14" \
-    JDKLATEST_BOOT_DIR="/usr/lib/jvm/jdk-14" \
+    JDK10_BOOT_DIR="/usr/lib/jvm/jdk10" \
+    JDK11_BOOT_DIR="/usr/lib/jvm/jdk11" \
+    JDK13_BOOT_DIR="/usr/lib/jvm/jdk13" \
+    JDK14_BOOT_DIR="/usr/lib/jvm/jdk14" \
+    JDKLATEST_BOOT_DIR="/usr/lib/jvm/jdk14" \
     JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk"
diff --git a/ansible/docker/Dockerfile.Ubuntu1604 b/ansible/docker/Dockerfile.Ubuntu1604
@@ -33,9 +33,9 @@ RUN mv /bin/uname /bin/uname.real && echo "/bin/uname.real \$@ | sed 's/aarch64/
 ENV \
     JDK7_BOOT_DIR="/usr/lib/jvm/jdk8" \
     JDK8_BOOT_DIR="/usr/lib/jvm/jdk8" \
-    JDK10_BOOT_DIR="/usr/lib/jvm/jdk-10" \
-    JDK11_BOOT_DIR="/usr/lib/jvm/jdk-11" \
-    JDK13_BOOT_DIR="/usr/lib/jvm/jdk-13" \
-    JDK14_BOOT_DIR="/usr/lib/jvm/jdk-14" \
-    JDKLATEST_BOOT_DIR="/usr/lib/jvm/jdk-14" \
+    JDK10_BOOT_DIR="/usr/lib/jvm/jdk10" \
+    JDK11_BOOT_DIR="/usr/lib/jvm/jdk11" \
+    JDK13_BOOT_DIR="/usr/lib/jvm/jdk13" \
+    JDK14_BOOT_DIR="/usr/lib/jvm/jdk14" \
+    JDKLATEST_BOOT_DIR="/usr/lib/jvm/jdk14" \
     JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk"
diff --git a/ansible/docker/Dockerfile.Ubuntu2004-riscv64 b/ansible/docker/Dockerfile.Ubuntu2004-riscv64
@@ -20,8 +20,8 @@ RUN groupadd -g 1000 ${user}
 RUN useradd -c "Jenkins user" -d /home/${user} -u 1000 -g 1000 -m ${user}
 
 ENV \
-    JDK11_BOOT_DIR="/usr/lib/jvm/jdk-11" \
-    JDK17_BOOT_DIR="/usr/lib/jvm/jdk-17" \
-    JDK19_BOOT_DIR="/usr/lib/jvm/jdk-19" \
-    JDK21_BOOT_DIR="/usr/lib/jvm/jdk-21" \
-    JAVA_HOME="/usr/lib/jvm/jdk-11"
+    JDK11_BOOT_DIR="/usr/lib/jvm/jdk11" \
+    JDK17_BOOT_DIR="/usr/lib/jvm/jdk17" \
+    JDK19_BOOT_DIR="/usr/lib/jvm/jdk19" \
+    JDK21_BOOT_DIR="/usr/lib/jvm/jdk21" \
+    JAVA_HOME="/usr/lib/jvm/jdk11"
diff --git a/ansible/docker/Dockerfile.Ubuntu2204 b/ansible/docker/Dockerfile.Ubuntu2204
@@ -22,9 +22,9 @@ RUN useradd -c "Jenkins user" -d /home/${user} -u 1000 -g 1000 -m ${user}
 ENV \
     JDK7_BOOT_DIR="/usr/lib/jvm/jdk8" \
     JDK8_BOOT_DIR="/usr/lib/jvm/jdk8" \
-    JDK10_BOOT_DIR="/usr/lib/jvm/jdk-10" \
-    JDK11_BOOT_DIR="/usr/lib/jvm/jdk-11" \
-    JDK13_BOOT_DIR="/usr/lib/jvm/jdk-13" \
-    JDK14_BOOT_DIR="/usr/lib/jvm/jdk-14" \
-    JDKLATEST_BOOT_DIR="/usr/lib/jvm/jdk-14" \
+    JDK10_BOOT_DIR="/usr/lib/jvm/jdk10" \
+    JDK11_BOOT_DIR="/usr/lib/jvm/jdk11" \
+    JDK13_BOOT_DIR="/usr/lib/jvm/jdk13" \
+    JDK14_BOOT_DIR="/usr/lib/jvm/jdk14" \
+    JDKLATEST_BOOT_DIR="/usr/lib/jvm/jdk14" \
     JAVA_HOME="/usr/lib/jvm/java-1.8.0-openjdk"
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
@@ -33,15 +33,15 @@
 
 - name: Set path variable when jdk_version != 8
   set_fact:
-    path: /usr/lib/jvm/jdk-{{ jdk_version }}
+    path: /usr/lib/jvm/jdk{{ jdk_version }}
   when:
     - jdk_version != 8
     - ansible_distribution != "MacOSX"
   tags: adoptopenjdk_install
 
 - name: Set path variable (macOS)
   set_fact:
-    path: "/Library/Java/JavaVirtualMachines/jdk-{{ jdk_version }}"
+    path: "/Library/Java/JavaVirtualMachines/jdk{{ jdk_version }}"
   when: ansible_distribution == "MacOSX"
   tags: adoptopenjdk_install
 
@@ -136,7 +136,7 @@
     - not usr_lib_jvm_exists.stat.exists
   tags: adoptopenjdk_install
 
-- name: Check if jdk-{{ jdk_version }} is already installed in the target location
+- name: Check if jdk{{ jdk_version }} is already installed in the target location
   shell: ls -ld {{ path }} >/dev/null 2>&1
   failed_when: false
   register: adoptopenjdk_installed
@@ -356,17 +356,21 @@
       until: adoptopenjdk_unpack is not failed
 
 - name: Get {{ path }}* full path name
-  shell: set -o pipefail | ls -ld {{ path }}* 2>/dev/null | awk '{print $9}'
-  register: adoptopenjdk_dir
-  changed_when: false
+  find:
+    paths: /usr/lib/jvm
+    patterns:
+      - "^jdk{{ jdk_version }}*"
+      - "^jdk-{{ jdk_version }}.*"
+    use_regex: yes
+    file_type: directory
   when:
     - ansible_distribution != "MacOSX"
     - adoptopenjdk_installed.rc != 0
-  tags: adoptopenjdk_install
+  register: adoptopenjdk_dir
 
 - name: Create symlink to major version
   file:
-    src: '{{ adoptopenjdk_dir.stdout }}'
+    src: '{{ adoptopenjdk_dir.files[0].path }}'
     dest: '{{ path }}'
     state: link
   when:
@@ -376,7 +380,7 @@
 
 - name: Chown {{ path }}*
   file:
-    path: '{{ adoptopenjdk_dir.stdout }}'
+    path: '{{ adoptopenjdk_dir.files[0].path }}'
     state: directory
     owner: root
     recurse: yes