From 8803a16b196c127edb73c33b63ec9ace14008fd5 Mon Sep 17 00:00:00 2001 From: Haroon Khel <34969545+Haroon-Khel@users.noreply.github.com> Date: Wed, 6 Nov 2024 22:21:55 +0800 Subject: [PATCH 1/4] 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 --- ansible/docker/Dockerfile.Alpine3 | 6 ++--- ansible/docker/Dockerfile.CentOS6 | 10 ++++----- ansible/docker/Dockerfile.CentOS7 | 10 ++++----- ansible/docker/Dockerfile.Ubuntu1604 | 10 ++++----- ansible/docker/Dockerfile.Ubuntu2004-riscv64 | 10 ++++----- ansible/docker/Dockerfile.Ubuntu2204 | 10 ++++----- .../roles/adoptopenjdk_install/tasks/main.yml | 22 +++++++++++-------- 7 files changed, 41 insertions(+), 37 deletions(-) diff --git a/ansible/docker/Dockerfile.Alpine3 b/ansible/docker/Dockerfile.Alpine3 index fa5ab579e9..cb9f235aad 100644 --- 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 index 49f2274cde..73b87b09d8 100644 --- 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 index 5f430918c6..c6c684d6b5 100644 --- 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 index 0a299053d1..a2a2a7f6a5 100644 --- 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 index 72d9c3665d..21d7aff700 100644 --- 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 index a256077f70..a7135b1b2d 100644 --- 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 index f4ab2c0791..cfc60fb35e 100644 --- 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,7 +33,7 @@ - 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" @@ -41,7 +41,7 @@ - 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 From cc0e2e598b0155e85c94cd20118d31625f612c36 Mon Sep 17 00:00:00 2001 From: Stewart X Addison <6487691+sxa@users.noreply.github.com> Date: Thu, 7 Nov 2024 14:52:50 +0000 Subject: [PATCH 2/4] inventory: remove equinix awx systems (#3795) Signed-off-by: Stewart X Addison --- ansible/inventory.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 266ce34203..31c5bef9b3 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -19,10 +19,6 @@ hosts: - digitalocean: ubuntu2004-x64-1: {ip: 178.62.115.224, description: bastillion.adoptopenjdk.net} - - equinix: - ubuntu1604-x64-1: {ip: 147.75.80.219, description: ansible.adoptopenjdk.net} - ubuntu2004-x64-1: {ip: 147.75.80.235, description: awx.adoptopenjdk.net} - - hetzner: ubuntu1604-x64-1: {ip: 78.47.239.96, description: nagios.adoptopenjdk.net} ubuntu2004-x64-1: {ip: 78.47.239.97, description: ci.adoptium.net} From c195e3c93af4e53400b9fcb2e9e3452280ca6cea Mon Sep 17 00:00:00 2001 From: Haroon Khel <34969545+Haroon-Khel@users.noreply.github.com> Date: Fri, 8 Nov 2024 19:30:57 +0800 Subject: [PATCH 3/4] unixPB: Dont install GA JDK17 bootjdk on alpine aarch64 (#3805) * unixPB: Dont install alpine aarch64 JDK17 bootjdk * Remove hyphens from symlinks in bootjdks installed from Common role * typo --- .../AdoptOpenJDK_Unix_Playbook/main.yml | 1 + .../roles/Common/tasks/Alpine.yml | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml index 06073ba261..94b9424d37 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml @@ -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 diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml index 5bcfd453af..3ca25d603f 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/Common/tasks/Alpine.yml @@ -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 @@ -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 @@ -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 @@ -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: @@ -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 From afb0e11f657fcc357a30debfe1de925d053b0b51 Mon Sep 17 00:00:00 2001 From: Haroon Khel <34969545+Haroon-Khel@users.noreply.github.com> Date: Sun, 10 Nov 2024 09:50:44 +0800 Subject: [PATCH 4/4] unixPb: Correct the condition on JDK17 alpine aarch64 install (#3807) --- ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml index 94b9424d37..3c73b69aad 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml @@ -126,7 +126,7 @@ jdk_version: 17 when: - ansible_distribution != "Solaris" - - (ansible_distribution != "Alpine" and ansible_architecture != "aarch64") + - not (ansible_distribution == "Alpine" and ansible_architecture == "aarch64") tags: build_tools - role: adoptopenjdk_install # JDK21 Build Bootstrap jdk_version: 20