unixPb: Remove hyphen from Bootjdk symlinks

adoptium · Oct 9, 2024 · 9076832 · 9076832
1 parent 6edae3d
commit 9076832
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 30 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