Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

unixPb: Remove hyphen from Bootjdk symlinks #3773

Merged
merged 6 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ansible/docker/Dockerfile.Alpine3
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 5 additions & 5 deletions ansible/docker/Dockerfile.CentOS6
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 5 additions & 5 deletions ansible/docker/Dockerfile.CentOS7
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 5 additions & 5 deletions ansible/docker/Dockerfile.Ubuntu1604
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 5 additions & 5 deletions ansible/docker/Dockerfile.Ubuntu2004-riscv64
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 5 additions & 5 deletions ansible/docker/Dockerfile.Ubuntu2204
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -376,7 +380,7 @@

- name: Chown {{ path }}*
file:
path: '{{ adoptopenjdk_dir.stdout }}'
path: '{{ adoptopenjdk_dir.files[0].path }}'
state: directory
owner: root
recurse: yes
Expand Down
Loading