From 5cb07ffcf748e15e8854dd41f8ef910c01338c60 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Wed, 24 May 2023 12:54:46 +0100 Subject: [PATCH 01/17] unixPB aixPB winPB: Update boot JDKs to match current requirements Signed-off-by: Stewart X Addison --- .../roles/bootjdk/tasks/main.yml | 2 +- ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml | 8 ++++---- .../playbooks/AdoptOpenJDK_Windows_Playbook/main.yml | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml index 45dccace65..397c3cadc2 100644 --- a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml @@ -17,8 +17,8 @@ - '8' - '10' - '11' - - '16' - '17' + - '20' - name: Set /usr/java8_64 as default file: diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml index 750ed586a8..67148d6bb4 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml @@ -113,15 +113,15 @@ when: - ansible_distribution != "Solaris" tags: build_tools - - role: adoptopenjdk_install # JDK19 Build Bootstrap - jdk_version: 18 + - role: adoptopenjdk_install # JDK20 Build Bootstrap + jdk_version: 19 when: - ansible_distribution != "Alpine" - ansible_distribution != "Solaris" - ansible_architecture != "riscv64" tags: build_tools - - role: adoptopenjdk_install # JDK20 Build Bootstrap - jdk_version: 19 + - role: adoptopenjdk_install # JDK21 Build Bootstrap + jdk_version: 20 when: - ansible_distribution != "Alpine" - ansible_distribution != "Solaris" diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml index c7e09c00db..0feb9f0891 100644 --- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml @@ -59,12 +59,12 @@ jdk_version: 10 - role: Java_install # For Gradle jdk_version: 11 - - role: Java_install # JDK16 build bootstrap - jdk_version: 15 - - role: Java_install # JDK17 build bootstrap - jdk_version: 16 - - role: Java_install + - role: Java_install # Latest LTS, for use by agents jdk_version: 17 + - role: Java_install # Bootstrap for JDK20 + jdk_version: 19 + - role: Java_install # Bootstrap for JDK21 + jdk_version: 20 - ANT # Testing - role: MSVS_2013 when: ansible_architecture == "64-bit" From c1b8378eb9d57046c1f3f306205cdc20ffc5b9f6 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Wed, 24 May 2023 15:33:02 +0100 Subject: [PATCH 02/17] Download JDK10 for windows from api.adoptopenjdk.net Signed-off-by: Stewart X Addison --- .../roles/Java_install/tasks/main.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml index f0eba7af35..fbc753ab3a 100644 --- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml @@ -8,11 +8,24 @@ register: java_installed tags: Java_install + +- name: Set API source for old java versions + set_fact: apisource=api.adoptopenjdk.net + when: jdk_version==10 + - name: Download Java{{ jdk_version }} win_get_url: url: https://api.adoptopenjdk.net/v3/binary/latest/{{ jdk_version }}/ga/windows/x64/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk dest: 'C:\temp\jdk-{{ jdk_version }}.zip' - when: not java_installed.stat.exists + when: not java_installed.stat.exists and jdk_version!=10 + tags: Java_install + +# Java 10 is the only version we still need to retrieve from adoptopenjdk +- name: Download Java{{ jdk_version }} from adoptopenjdk + win_get_url: + url: https://api.adoptopenjdk.net/v3/binary/latest/{{ jdk_version }}/ga/windows/x64/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk + dest: 'C:\temp\jdk-{{ jdk_version }}.zip' + when: not java_installed.stat.exists and jdk_version==10 tags: Java_install - name: Install Java{{ jdk_version }} From abb88398d60f6d3dc64e4fc81a268bf3330c74f4 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Fri, 9 Jun 2023 15:51:00 +0100 Subject: [PATCH 03/17] unixPB: Update role to pull JDKs from api.adoptium for current releases Signed-off-by: Stewart X Addison --- .../roles/adoptopenjdk_install/tasks/main.yml | 34 +++++++++++++------ 1 file changed, 23 insertions(+), 11 deletions(-) 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 1082036599..03ad2b9b92 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 @@ -146,15 +146,27 @@ - not (jdk_version == 8 and ansible_architecture == "s390x") register: sig_output - - name: Download latest release (Linux/Alpine-Linux) + - name: Download latest release from api.adoptopenjdk.net (Linux/Alpine-Linux) get_url: url: https://api.adoptopenjdk.net/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk dest: /tmp/jdk{{ jdk_version }}.tar.gz mode: 0440 retries: 3 delay: 5 - register: adoptopenjdk_download - until: adoptopenjdk_download is not failed + register: adopt_download + until: adopt_download is not failed + when: {{ jdk_version }} == 10 or {{ jdk_version }} == 16 + + - name: Download latest release from api.adoptium.net (Linux/Alpine-Linux) + get_url: + url: https://api.adoptopenjdk.net/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/eclipse + dest: /tmp/jdk{{ jdk_version }}.tar.gz + mode: 0440 + retries: 3 + delay: 5 + register: adopt_download + until: adopt_download is not failed + when: not ( {{ jdk_version }} == 10 or {{ jdk_version }} == 16 ) - name: GPG Signature verification (Linux/Alpine-Linux) script: ../Supporting_Scripts/package_signature_verification.sh -f /tmp/jdk{{ jdk_version }}.tar.gz -sl "{{ sig_output.stdout }}" -k {{ key.adoptium }} @@ -310,8 +322,8 @@ ansible_python_interpreter: /usr/local/python2/bin/python2.7 retries: 3 delay: 5 - register: adoptopenjdk_download - until: adoptopenjdk_download is not failed + register: adopt_download + until: adopt_download is not failed - name: Get Signature File Link (CentOS6) shell: curl -s 'https://api.adoptium.net/v3/assets/feature_releases/{{ jdk_version }}/ga?architecture={{ api_architecture }}&heap_size=normal&image_type=jdk&jvm_impl={{ bootjdk }}&os={{ platformLinux }}&page=0&page_size=1&project=jdk&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' @@ -345,8 +357,8 @@ get_url: url: https://api.adoptium.net/v3/installer/latest/{{ jdk_version }}/ga/mac/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/eclipse?project=jdk dest: /tmp/{{ jdk_version }}-installer.pkg - register: adoptopenjdk_download - until: adoptopenjdk_download is not failed + register: adopt_download + until: adopt_download is not failed when: - jdk_version != 10 @@ -359,8 +371,8 @@ become_user: root retries: 3 delay: 5 - register: adoptopenjdk_download - until: adoptopenjdk_download is not failed + register: adopt_download + until: adopt_download is not failed when: - jdk_version == 10 @@ -413,8 +425,8 @@ block: - name: Download latest JDK {{ jdk_version }} release (Solaris) command: wget https://api.adoptium.net/v3/binary/latest/{{ jdk_version }}/ga/solaris/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/eclipse?project=jdk -O /tmp/jdk-{{ jdk_version }}.tar.gz - register: adoptopenjdk_download - until: adoptopenjdk_download is not failed + register: adopt_download + until: adopt_download is not failed - name: Get Signature File Link (Solaris) shell: curl -s 'https://api.adoptium.net/v3/assets/latest/{{ jdk_version }}/{{ bootjdk }}?architecture={{ api_architecture }}&image_type=jdk&os=solaris&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' From 383a0a335738b8fa17513ca379236170627840e0 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Thu, 15 Feb 2024 16:15:32 +0000 Subject: [PATCH 04/17] Use correct API for each JDK version Signed-off-by: Stewart X Addison --- .../AdoptOpenJDK_Unix_Playbook/main.yml | 13 ++-- .../roles/adoptopenjdk_install/tasks/main.yml | 75 ++++++++++--------- .../roles/Java_install/tasks/main.yml | 21 ++++-- 3 files changed, 61 insertions(+), 48 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml index 67148d6bb4..6beee1850b 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml @@ -113,13 +113,6 @@ when: - ansible_distribution != "Solaris" tags: build_tools - - role: adoptopenjdk_install # JDK20 Build Bootstrap - jdk_version: 19 - when: - - ansible_distribution != "Alpine" - - ansible_distribution != "Solaris" - - ansible_architecture != "riscv64" - tags: build_tools - role: adoptopenjdk_install # JDK21 Build Bootstrap jdk_version: 20 when: @@ -131,6 +124,12 @@ when: - ansible_architecture == "riscv64" tags: build_tools + - role: adoptopenjdk_install # JDK22 Build Bootstrap + jdk_version: 21 + when: + - ansible_distribution != "Solaris" + - ansible_architecture != "armv7l" + tags: build_tools - role: Nagios_Plugins # AdoptOpenJDK Infrastructure tags: [nagios_plugins, adoptopenjdk] - role: Nagios_Master_Config # AdoptOpenJDK Infrastructure 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 03ad2b9b92..c72b4b36b5 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 @@ -1,12 +1,26 @@ --- -############################################################## -# ansible install adoptopenjdk into /usr/lib/jvm/JDK_VERSION # -############################################################## +############################################################### +# ansible install adopt binary into /usr/lib/jvm/JDK_VERSION # +############################################################### # Conditions: # Check if target is installed # Proceed with installing to /usr/lib/jvm +- name: Use adoptium API if release is available at adoptium + set_fact: + api_url: https://api.adoptium.net + when: + - ( jdk_version == 8 || jdk_version == 11 || jdk_version >= 17 ) + tags: adoptopenjdk_install + +- name: Use adoptopenjdk API if release is not supported by adoptium + set_fact: + api_url: https://api.adoptopenjdk.net + when: + - ! ( jdk_version == 8 || jdk_version == 11 || jdk_version >= 17 ) + tags: adoptopenjdk_install + - name: Set path variable when jdk_version == 8 set_fact: path: /usr/lib/jvm/jdk8 @@ -140,33 +154,21 @@ # Api does not return release information for JDK10 block: - name: Get Signature File Link (Linux/Alpine-Linux) - shell: curl -s 'https://api.adoptium.net/v3/assets/feature_releases/{{ jdk_version }}/ga?architecture={{ api_architecture }}&heap_size=normal&image_type=jdk&jvm_impl={{ bootjdk }}&os={{ platformLinux }}&page=0&page_size=1&project=jdk&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' + shell: curl -s '{{ api_url }}/v3/assets/feature_releases/{{ jdk_version }}/ga?architecture={{ api_architecture }}&heap_size=normal&image_type=jdk&jvm_impl={{ bootjdk }}&os={{ platformLinux }}&page=0&page_size=1&project=jdk&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' when: - jdk_version != 10 - not (jdk_version == 8 and ansible_architecture == "s390x") register: sig_output - - name: Download latest release from api.adoptopenjdk.net (Linux/Alpine-Linux) - get_url: - url: https://api.adoptopenjdk.net/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk - dest: /tmp/jdk{{ jdk_version }}.tar.gz - mode: 0440 - retries: 3 - delay: 5 - register: adopt_download - until: adopt_download is not failed - when: {{ jdk_version }} == 10 or {{ jdk_version }} == 16 - - - name: Download latest release from api.adoptium.net (Linux/Alpine-Linux) + - name: Download latest release (Linux/Alpine-Linux) get_url: - url: https://api.adoptopenjdk.net/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/eclipse + url: {{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk dest: /tmp/jdk{{ jdk_version }}.tar.gz mode: 0440 retries: 3 delay: 5 - register: adopt_download - until: adopt_download is not failed - when: not ( {{ jdk_version }} == 10 or {{ jdk_version }} == 16 ) + register: adoptopenjdk_download + until: adoptopenjdk_download is not failed - name: GPG Signature verification (Linux/Alpine-Linux) script: ../Supporting_Scripts/package_signature_verification.sh -f /tmp/jdk{{ jdk_version }}.tar.gz -sl "{{ sig_output.stdout }}" -k {{ key.adoptium }} @@ -185,6 +187,7 @@ path: /tmp/jdk{{ jdk_version }}.tar.gz state: absent +<<<<<<< HEAD # JDK 21 on Linux-riscv64 is a special-case because JDK 21 is the first version that supports # RISC-V. There is also no JDK 21 or 20 available on Ubuntu 20.04 that we can use as boot JDK. - name: Install JDK {{ jdk_version }} on Linux-riscv64 @@ -216,6 +219,8 @@ path: /tmp/jdk21.tar.gz state: absent +======= +>>>>>>> b240053 (Use correct API for each JDK version) # JDK 19 on Linux-riscv64 is a special-case because JDK 19 is the first version that supports # RISC-V. There is also no JDK 19 or 20 available on Ubuntu 20.04 that we can use as boot JDK. - name: Install JDK {{ jdk_version }} on Linux-riscv64 @@ -317,16 +322,16 @@ tags: adoptopenjdk_install block: - name: Download latest JDK {{ jdk_version }} release (CentOS6) - command: wget -q 'https://api.adoptopenjdk.net/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk' -O /tmp/jdk{{ jdk_version }}.tar.gz + command: wget -q '{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk' -O /tmp/jdk{{ jdk_version }}.tar.gz vars: ansible_python_interpreter: /usr/local/python2/bin/python2.7 retries: 3 delay: 5 - register: adopt_download - until: adopt_download is not failed + register: adoptopenjdk_download + until: adoptopenjdk_download is not failed - name: Get Signature File Link (CentOS6) - shell: curl -s 'https://api.adoptium.net/v3/assets/feature_releases/{{ jdk_version }}/ga?architecture={{ api_architecture }}&heap_size=normal&image_type=jdk&jvm_impl={{ bootjdk }}&os={{ platformLinux }}&page=0&page_size=1&project=jdk&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' + shell: curl -s '{{ api_url }}/v3/assets/feature_releases/{{ jdk_version }}/ga?architecture={{ api_architecture }}&heap_size=normal&image_type=jdk&jvm_impl={{ bootjdk }}&os={{ platformLinux }}&page=0&page_size=1&project=jdk&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' when: - jdk_version != 10 register: sig_output @@ -355,29 +360,29 @@ block: - name: Download latest JDK {{ jdk_version }} release (macOS) get_url: - url: https://api.adoptium.net/v3/installer/latest/{{ jdk_version }}/ga/mac/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/eclipse?project=jdk + url: {{ api_url }}/v3/installer/latest/{{ jdk_version }}/ga/mac/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/eclipse?project=jdk dest: /tmp/{{ jdk_version }}-installer.pkg - register: adopt_download - until: adopt_download is not failed + register: adoptopenjdk_download + until: adoptopenjdk_download is not failed when: - jdk_version != 10 - name: Download JDK10 tarball when installer is not available (macOS) unarchive: - src: https://api.adoptopenjdk.net/v3/binary/latest/{{ jdk_version }}/ga/mac/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk + src: {{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/mac/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk remote_src: yes dest: /Library/Java/JavaVirtualMachines/ become: yes become_user: root retries: 3 delay: 5 - register: adopt_download - until: adopt_download is not failed + register: adoptopenjdk_download + until: adoptopenjdk_download is not failed when: - jdk_version == 10 - name: Get Signature File Link (macOS) - shell: curl -s 'https://api.adoptium.net/v3/assets/latest/{{ jdk_version }}/{{ bootjdk }}?architecture={{ api_architecture }}&image_type=jdk&os=mac&vendor=eclipse' | grep signature_link | grep pkg | awk '{split($0,a,"\""); print a[4]}' + shell: curl -s '{{ api_url }}/v3/assets/latest/{{ jdk_version }}/{{ bootjdk }}?architecture={{ api_architecture }}&image_type=jdk&os=mac&vendor=eclipse' | grep signature_link | grep pkg | awk '{split($0,a,"\""); print a[4]}' when: - jdk_version != 10 register: sig_output @@ -424,12 +429,12 @@ tags: adoptopenjdk_install block: - name: Download latest JDK {{ jdk_version }} release (Solaris) - command: wget https://api.adoptium.net/v3/binary/latest/{{ jdk_version }}/ga/solaris/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/eclipse?project=jdk -O /tmp/jdk-{{ jdk_version }}.tar.gz - register: adopt_download - until: adopt_download is not failed + command: wget {{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/solaris/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/eclipse?project=jdk -O /tmp/jdk-{{ jdk_version }}.tar.gz + register: adoptopenjdk_download + until: adoptopenjdk_download is not failed - name: Get Signature File Link (Solaris) - shell: curl -s 'https://api.adoptium.net/v3/assets/latest/{{ jdk_version }}/{{ bootjdk }}?architecture={{ api_architecture }}&image_type=jdk&os=solaris&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' + shell: curl -s '{{ api_url }}/v3/assets/latest/{{ jdk_version }}/{{ bootjdk }}?architecture={{ api_architecture }}&image_type=jdk&os=solaris&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' register: sig_output - name: GPG Signature verification (Solaris) diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml index fbc753ab3a..b096bf0df3 100644 --- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml @@ -8,14 +8,23 @@ register: java_installed tags: Java_install +- name: Use adoptium API if release is available at adoptium + set_fact: + api_url: https://api.adoptium.net + when: + - ( jdk_version == 8 || jdk_version == 11 || jdk_version >= 17 ) + tags: adoptopenjdk_install + +- name: Use adoptopenjdk API if release is not supported by adoptium + set_fact: + api_url: https://api.adoptopenjdk.net + when: + - ! ( jdk_version == 8 || jdk_version == 11 || jdk_version >= 17 ) + tags: adoptopenjdk_install -- name: Set API source for old java versions - set_fact: apisource=api.adoptopenjdk.net - when: jdk_version==10 - - name: Download Java{{ jdk_version }} win_get_url: - url: https://api.adoptopenjdk.net/v3/binary/latest/{{ jdk_version }}/ga/windows/x64/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk + url: {{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/windows/x64/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk dest: 'C:\temp\jdk-{{ jdk_version }}.zip' when: not java_installed.stat.exists and jdk_version!=10 tags: Java_install @@ -23,7 +32,7 @@ # Java 10 is the only version we still need to retrieve from adoptopenjdk - name: Download Java{{ jdk_version }} from adoptopenjdk win_get_url: - url: https://api.adoptopenjdk.net/v3/binary/latest/{{ jdk_version }}/ga/windows/x64/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk + url: {{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/windows/x64/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk dest: 'C:\temp\jdk-{{ jdk_version }}.zip' when: not java_installed.stat.exists and jdk_version==10 tags: Java_install From c5c4856c7a6c94d9283f59f1d41aad6d6452d6bf Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Thu, 15 Feb 2024 16:51:39 +0000 Subject: [PATCH 05/17] variable expansions at start of expression must be quoted Signed-off-by: Stewart X Addison --- .../roles/adoptopenjdk_install/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 c72b4b36b5..5237aa1763 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 @@ -162,7 +162,7 @@ - name: Download latest release (Linux/Alpine-Linux) get_url: - url: {{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk + url: "{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk" dest: /tmp/jdk{{ jdk_version }}.tar.gz mode: 0440 retries: 3 @@ -360,7 +360,7 @@ block: - name: Download latest JDK {{ jdk_version }} release (macOS) get_url: - url: {{ api_url }}/v3/installer/latest/{{ jdk_version }}/ga/mac/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/eclipse?project=jdk + url: "{{ api_url }}/v3/installer/latest/{{ jdk_version }}/ga/mac/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/eclipse?project=jdk" dest: /tmp/{{ jdk_version }}-installer.pkg register: adoptopenjdk_download until: adoptopenjdk_download is not failed @@ -369,7 +369,7 @@ - name: Download JDK10 tarball when installer is not available (macOS) unarchive: - src: {{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/mac/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk + src: "{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/mac/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk" remote_src: yes dest: /Library/Java/JavaVirtualMachines/ become: yes From 7f3a46b2c25f3efd1c19de539ee4141a1267015a Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Thu, 15 Feb 2024 17:30:07 +0000 Subject: [PATCH 06/17] Fix OR conditional Signed-off-by: Stewart X Addison --- .../roles/adoptopenjdk_install/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 5237aa1763..e766636ee0 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 @@ -11,14 +11,14 @@ set_fact: api_url: https://api.adoptium.net when: - - ( jdk_version == 8 || jdk_version == 11 || jdk_version >= 17 ) + - ( jdk_version == 8 OR jdk_version == 11 OR jdk_version >= 17 ) tags: adoptopenjdk_install - name: Use adoptopenjdk API if release is not supported by adoptium set_fact: api_url: https://api.adoptopenjdk.net when: - - ! ( jdk_version == 8 || jdk_version == 11 || jdk_version >= 17 ) + - ! ( jdk_version == 8 OR jdk_version == 11 OR jdk_version >= 17 ) tags: adoptopenjdk_install - name: Set path variable when jdk_version == 8 From 369eb4c13195863c40fef8f07851c67414854c7c Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Thu, 15 Feb 2024 17:40:19 +0000 Subject: [PATCH 07/17] fix conditional Signed-off-by: Stewart X Addison --- .../roles/adoptopenjdk_install/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 e766636ee0..c4948d56e1 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 @@ -11,14 +11,14 @@ set_fact: api_url: https://api.adoptium.net when: - - ( jdk_version == 8 OR jdk_version == 11 OR jdk_version >= 17 ) + - jdk_version == 8 OR jdk_version == 11 OR jdk_version | int >= 17 tags: adoptopenjdk_install - name: Use adoptopenjdk API if release is not supported by adoptium set_fact: api_url: https://api.adoptopenjdk.net when: - - ! ( jdk_version == 8 OR jdk_version == 11 OR jdk_version >= 17 ) + - ! ( jdk_version == 8 OR jdk_version == 11 OR jdk_version | int >= 17 ) tags: adoptopenjdk_install - name: Set path variable when jdk_version == 8 From 22b18dc9cfb071b900f39435b8f43c8a57f8fcff Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Thu, 15 Feb 2024 18:26:27 +0000 Subject: [PATCH 08/17] syntax fixup Signed-off-by: Stewart X Addison --- .../roles/adoptopenjdk_install/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c4948d56e1..b213ef24ed 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 @@ -11,14 +11,14 @@ set_fact: api_url: https://api.adoptium.net when: - - jdk_version == 8 OR jdk_version == 11 OR jdk_version | int >= 17 + - jdk_version == 8 or jdk_version == 11 or jdk_version | int >= 17 tags: adoptopenjdk_install - name: Use adoptopenjdk API if release is not supported by adoptium set_fact: api_url: https://api.adoptopenjdk.net when: - - ! ( jdk_version == 8 OR jdk_version == 11 OR jdk_version | int >= 17 ) + - ! ( jdk_version == 8 or jdk_version == 11 or jdk_version >= 17 ) tags: adoptopenjdk_install - name: Set path variable when jdk_version == 8 From 089722d405825eead27925629542e45fb0f82f3a Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Fri, 8 Mar 2024 12:45:51 +0000 Subject: [PATCH 09/17] Final fixups, plus inclusing JDK21 where possible Signed-off-by: Stewart X Addison --- .../roles/bootjdk/tasks/main.yml | 2 + .../roles/bootjdk/tasks/openjdk.yml | 37 ++++++++++++++++--- .../AdoptOpenJDK_Unix_Playbook/main.yml | 7 +--- .../AdoptOpenJDK_Windows_Playbook/main.yml | 4 +- 4 files changed, 37 insertions(+), 13 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml index 397c3cadc2..0c4faba35d 100644 --- a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml @@ -17,8 +17,10 @@ - '8' - '10' - '11' + - '16' - '17' - '20' + - '21' - name: Set /usr/java8_64 as default file: diff --git a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml index c5ca659635..1ba754d0ab 100644 --- a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml +++ b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml @@ -7,10 +7,10 @@ os_img: "aix/ppc64/jdk" heap: "normal" impl: "hotspot" - new_baseurl: "https://api.adoptium.net/v3/binary/latest" - new_vendor: "eclipse" - baseurl: "https://api.adoptopenjdk.net/v3/binary/latest" - vendor: "adoptopenjdk" + adoptium_baseurl: "https://api.adoptium.net/v3/binary/latest" + adoptium_vendor: "eclipse" + adoptopenjdk_baseurl: "https://api.adoptopenjdk.net/v3/binary/latest" + adoptopenjdk_vendor: "adoptopenjdk" project: "{{ heap }}/{{ vendor }}?project=jdk" block: - name: Verify space in /usr @@ -21,9 +21,35 @@ path: /usr/java{{ jdk }}_64 register: java_installed + - name: Download JDK {{ jdk }} binary from api.adoptopenjdk.net + get_url: + url: "{{ adoptopenjdk_baseurl }}/{{ jdk }}/ga/{{ os_img }}/{{ impl }}/{{ adoptopenjdk_project }}" + dest: /tmp/jdk{{ jdk }}.tar.gz + mode: 0440 + timeout: 25 + retries: 3 + delay: 5 + when: + - java_installed.stat.isdir is not defined + - ! ( jdk == 8 or jdk == 11 or jdk >= 17 ) + register: openjdk + + - name: Download JDK {{ jdk }} binary from api.adoptium.net + get_url: + url: "{{ adoptium_baseurl }}/{{ jdk }}/ga/{{ os_img }}/{{ impl }}/{{ adoptium_project }}" + dest: /tmp/jdk{{ jdk }}.tar.gz + mode: 0440 + timeout: 25 + retries: 3 + delay: 5 + when: + - java_installed.stat.isdir is not defined + - jdk == 8 or jdk == 11 or jdk >= 17 + register: openjdk + - name: Download JDK {{ jdk }} binary get_url: - url: "{{ baseurl }}/{{ jdk }}/ga/{{ os_img }}/{{ impl }}/{{ project }}" + url: "{{ adoptopenjdk_baseurl }}/{{ jdk }}/ga/{{ os_img }}/{{ impl }}/{{ project }}" dest: /tmp/jdk{{ jdk }}.tar.gz mode: 0440 timeout: 25 @@ -31,6 +57,7 @@ delay: 5 when: - java_installed.stat.isdir is not defined + - jdk < 17 register: openjdk - name: Get Signature File Link diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml index 6beee1850b..107ce03e81 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml @@ -122,12 +122,7 @@ - role: adoptopenjdk_install # Current LTS jdk_version: 21 when: - - ansible_architecture == "riscv64" - tags: build_tools - - role: adoptopenjdk_install # JDK22 Build Bootstrap - jdk_version: 21 - when: - - ansible_distribution != "Solaris" + - ansible_architecture != "Solaris" - ansible_architecture != "armv7l" tags: build_tools - role: Nagios_Plugins # AdoptOpenJDK Infrastructure diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml index 0feb9f0891..f665a2de5f 100644 --- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml @@ -61,10 +61,10 @@ jdk_version: 11 - role: Java_install # Latest LTS, for use by agents jdk_version: 17 - - role: Java_install # Bootstrap for JDK20 - jdk_version: 19 - role: Java_install # Bootstrap for JDK21 jdk_version: 20 + - role: Java_install # Latest LTS, for use by agents + jdk_version: 21 - ANT # Testing - role: MSVS_2013 when: ansible_architecture == "64-bit" From c0c00e6d6427733eaf87e74287e305890031f021 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Fri, 8 Mar 2024 16:57:29 +0000 Subject: [PATCH 10/17] Updates following linter failures Signed-off-by: Stewart X Addison --- .../roles/bootjdk/tasks/openjdk.yml | 9 +++++---- .../roles/adoptopenjdk_install/tasks/main.yml | 3 --- .../AdoptOpenJDK_Windows_Playbook/main.yml | 2 ++ .../roles/Java_install/tasks/main.yml | 18 +++++------------- 4 files changed, 12 insertions(+), 20 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml index 1ba754d0ab..07e1c6d498 100644 --- a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml +++ b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml @@ -31,7 +31,7 @@ delay: 5 when: - java_installed.stat.isdir is not defined - - ! ( jdk == 8 or jdk == 11 or jdk >= 17 ) + - jdk == 10 or jdk == 16 # These are the only two we still use from adoptopenjdk API register: openjdk - name: Download JDK {{ jdk }} binary from api.adoptium.net @@ -44,10 +44,10 @@ delay: 5 when: - java_installed.stat.isdir is not defined - - jdk == 8 or jdk == 11 or jdk >= 17 + - ! ( jdk == 10 or jdk == 16 ) register: openjdk - - name: Download JDK {{ jdk }} binary + - name: Download JDK {{ jdk }} binary from api.adoptopenjdk.net get_url: url: "{{ adoptopenjdk_baseurl }}/{{ jdk }}/ga/{{ os_img }}/{{ impl }}/{{ project }}" dest: /tmp/jdk{{ jdk }}.tar.gz @@ -57,7 +57,8 @@ delay: 5 when: - java_installed.stat.isdir is not defined - - jdk < 17 + - jdk == 10 or jdk == 16 + register: openjdk - name: Get Signature File Link 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 b213ef24ed..1821386b52 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 @@ -187,7 +187,6 @@ path: /tmp/jdk{{ jdk_version }}.tar.gz state: absent -<<<<<<< HEAD # JDK 21 on Linux-riscv64 is a special-case because JDK 21 is the first version that supports # RISC-V. There is also no JDK 21 or 20 available on Ubuntu 20.04 that we can use as boot JDK. - name: Install JDK {{ jdk_version }} on Linux-riscv64 @@ -219,8 +218,6 @@ path: /tmp/jdk21.tar.gz state: absent -======= ->>>>>>> b240053 (Use correct API for each JDK version) # JDK 19 on Linux-riscv64 is a special-case because JDK 19 is the first version that supports # RISC-V. There is also no JDK 19 or 20 available on Ubuntu 20.04 that we can use as boot JDK. - name: Install JDK {{ jdk_version }} on Linux-riscv64 diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml index f665a2de5f..afc10a15c5 100644 --- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/main.yml @@ -59,6 +59,8 @@ jdk_version: 10 - role: Java_install # For Gradle jdk_version: 11 + - role: Java_install # Latest LTS, for use by agents + jdk_version: 16 - role: Java_install # Latest LTS, for use by agents jdk_version: 17 - role: Java_install # Bootstrap for JDK21 diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml index b096bf0df3..5198ca3658 100644 --- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml @@ -10,31 +10,23 @@ - name: Use adoptium API if release is available at adoptium set_fact: - api_url: https://api.adoptium.net + api_url: api.adoptium.net when: - ( jdk_version == 8 || jdk_version == 11 || jdk_version >= 17 ) tags: adoptopenjdk_install - name: Use adoptopenjdk API if release is not supported by adoptium set_fact: - api_url: https://api.adoptopenjdk.net + api_url: api.adoptopenjdk.net when: - ! ( jdk_version == 8 || jdk_version == 11 || jdk_version >= 17 ) tags: adoptopenjdk_install -- name: Download Java{{ jdk_version }} +- name: Download Temurin JDK {{ jdk_version }} win_get_url: - url: {{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/windows/x64/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk + url: https://{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/windows/x64/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk dest: 'C:\temp\jdk-{{ jdk_version }}.zip' - when: not java_installed.stat.exists and jdk_version!=10 - tags: Java_install - -# Java 10 is the only version we still need to retrieve from adoptopenjdk -- name: Download Java{{ jdk_version }} from adoptopenjdk - win_get_url: - url: {{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/windows/x64/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk - dest: 'C:\temp\jdk-{{ jdk_version }}.zip' - when: not java_installed.stat.exists and jdk_version==10 + when: not java_installed.stat.exists tags: Java_install - name: Install Java{{ jdk_version }} From 90d330552bb9a6814e35b490a48ed3a40a40e9af Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Sun, 10 Mar 2024 12:44:34 +0000 Subject: [PATCH 11/17] Fixups - testing Signed-off-by: Stewart X Addison --- .../roles/adoptopenjdk_install/tasks/main.yml | 44 ++++++++++--------- .../roles/Java_install/tasks/main.yml | 6 +-- 2 files changed, 26 insertions(+), 24 deletions(-) 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 1821386b52..25358ba3cd 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 @@ -10,15 +10,17 @@ - name: Use adoptium API if release is available at adoptium set_fact: api_url: https://api.adoptium.net + api_vendor: eclipse when: - - jdk_version == 8 or jdk_version == 11 or jdk_version | int >= 17 + - jdk_version == 8 or jdk_version == 11 or ( jdk_version | int >= 17) tags: adoptopenjdk_install - name: Use adoptopenjdk API if release is not supported by adoptium set_fact: api_url: https://api.adoptopenjdk.net + api_vendor: adoptopenjdk when: - - ! ( jdk_version == 8 or jdk_version == 11 or jdk_version >= 17 ) + - jdk_version == 10 or jdk_version == 16 tags: adoptopenjdk_install - name: Set path variable when jdk_version == 8 @@ -148,21 +150,21 @@ - ansible_distribution != "MacOSX" - not ((ansible_distribution == "RedHat" or ansible_distribution == "CentOS") and ansible_distribution_major_version == "6") - ansible_os_family != "Solaris" - - not (ansible_architecture == "riscv64" and (jdk_version == 21 or jdk_version == 19 or jdk_version == 17 or jdk_version == 11)) # Linux-riscv64 for JDK 11, 17, 19, 21 are special cased + - not (ansible_architecture == "riscv64" and (jdk_version == 21 or jdk_version == 20 or jdk_version == 19 or jdk_version == 17 or jdk_version == 11)) # Linux-riscv64 for JDK 11, 17, 19, 21 are special cased - adoptopenjdk_installed.rc != 0 tags: adoptopenjdk_install # Api does not return release information for JDK10 block: - name: Get Signature File Link (Linux/Alpine-Linux) - shell: curl -s '{{ api_url }}/v3/assets/feature_releases/{{ jdk_version }}/ga?architecture={{ api_architecture }}&heap_size=normal&image_type=jdk&jvm_impl={{ bootjdk }}&os={{ platformLinux }}&page=0&page_size=1&project=jdk&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' + shell: curl -s '{{ api_url }}/v3/assets/feature_releases/{{ jdk_version }}/ga?architecture={{ api_architecture }}&heap_size=normal&image_type=jdk&jvm_impl={{ bootjdk }}&os={{ platformLinux }}&page=0&page_size=1&project=jdk&vendor={{ api_vendor }}' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' when: - - jdk_version != 10 + - jdk_version != 10 and jdk_version != 16 - not (jdk_version == 8 and ansible_architecture == "s390x") register: sig_output - name: Download latest release (Linux/Alpine-Linux) get_url: - url: "{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk" + url: "{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/{{ api_vendor }}?project=jdk" dest: /tmp/jdk{{ jdk_version }}.tar.gz mode: 0440 retries: 3 @@ -173,10 +175,10 @@ - name: GPG Signature verification (Linux/Alpine-Linux) script: ../Supporting_Scripts/package_signature_verification.sh -f /tmp/jdk{{ jdk_version }}.tar.gz -sl "{{ sig_output.stdout }}" -k {{ key.adoptium }} when: - - jdk_version != 10 + - jdk_version != 10 and jdk_version != 16 - not (jdk_version == 8 and ansible_architecture == "s390x") - - name: Install latest release if one not already installed (Linux/Alpine-Linux) + - name: Install latest Adopt JDK{{ jdk_version }} if one not already installed (Linux/Alpine-Linux) unarchive: src: /tmp/jdk{{ jdk_version }}.tar.gz dest: /usr/lib/jvm @@ -319,7 +321,7 @@ tags: adoptopenjdk_install block: - name: Download latest JDK {{ jdk_version }} release (CentOS6) - command: wget -q '{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk' -O /tmp/jdk{{ jdk_version }}.tar.gz + command: wget -q '{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/{{ vendor }}?project=jdk' -O /tmp/jdk{{ jdk_version }}.tar.gz vars: ansible_python_interpreter: /usr/local/python2/bin/python2.7 retries: 3 @@ -328,15 +330,15 @@ until: adoptopenjdk_download is not failed - name: Get Signature File Link (CentOS6) - shell: curl -s '{{ api_url }}/v3/assets/feature_releases/{{ jdk_version }}/ga?architecture={{ api_architecture }}&heap_size=normal&image_type=jdk&jvm_impl={{ bootjdk }}&os={{ platformLinux }}&page=0&page_size=1&project=jdk&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' + shell: curl -s '{{ api_url }}/v3/assets/feature_releases/{{ jdk_version }}/ga?architecture={{ api_architecture }}&heap_size=normal&image_type=jdk&jvm_impl={{ bootjdk }}&os={{ platformLinux }}&page=0&page_size=1&project=jdk&vendor={{ api_vendor }}' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' when: - - jdk_version != 10 + - jdk_version != 10 and jdk_version != 16 register: sig_output - name: GPG Signature verification (CentOS6) script: ../Supporting_Scripts/package_signature_verification.sh -f /tmp/jdk{{ jdk_version }}.tar.gz -sl "{{ sig_output.stdout }}" -k {{ key.adoptium }} when: - - jdk_version != 10 + - jdk_version != 10 and jdk_version != 16 - name: Install latest JDK {{ jdk_version }} release (CentOS6) unarchive: @@ -357,16 +359,16 @@ block: - name: Download latest JDK {{ jdk_version }} release (macOS) get_url: - url: "{{ api_url }}/v3/installer/latest/{{ jdk_version }}/ga/mac/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/eclipse?project=jdk" + url: "{{ api_url }}/v3/installer/latest/{{ jdk_version }}/ga/mac/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/{{ api_vendor }}?project=jdk" dest: /tmp/{{ jdk_version }}-installer.pkg register: adoptopenjdk_download until: adoptopenjdk_download is not failed when: - - jdk_version != 10 + - jdk_version != 10 and jdk_version != 16 - name: Download JDK10 tarball when installer is not available (macOS) unarchive: - src: "{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/mac/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk" + src: "{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/mac/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/{{ api_vendor }}?project=jdk" remote_src: yes dest: /Library/Java/JavaVirtualMachines/ become: yes @@ -379,20 +381,20 @@ - jdk_version == 10 - name: Get Signature File Link (macOS) - shell: curl -s '{{ api_url }}/v3/assets/latest/{{ jdk_version }}/{{ bootjdk }}?architecture={{ api_architecture }}&image_type=jdk&os=mac&vendor=eclipse' | grep signature_link | grep pkg | awk '{split($0,a,"\""); print a[4]}' + shell: curl -s '{{ api_url }}/v3/assets/latest/{{ jdk_version }}/{{ bootjdk }}?architecture={{ api_architecture }}&image_type=jdk&os=mac&vendor={{ api_vendor }}' | grep signature_link | grep pkg | awk '{split($0,a,"\""); print a[4]}' when: - - jdk_version != 10 + - jdk_version != 10 and jdk_version != 16 register: sig_output - name: GPG Signature verification (macOS) script: ../Supporting_Scripts/package_signature_verification.sh -f /tmp/{{ jdk_version }}-installer.pkg -sl "{{ sig_output.stdout }}" -k {{ key.adoptium }} when: - - jdk_version != 10 + - jdk_version != 10 and jdk_version != 16 - name: Run installer for JDK {{ jdk_version }} (macOS) shell: sudo installer -pkg /tmp/{{ jdk_version }}-installer.pkg -target / when: - - jdk_version != 10 + - jdk_version != 10 and jdk_version != 16 # The boot JDK will be installed into a temurin directory. Playbooks, build and (possibly) test scripts will look for an adoptopenjdk directory # https://github.com/adoptium/infrastructure/issues/2281#issuecomment-1059322275 @@ -426,12 +428,12 @@ tags: adoptopenjdk_install block: - name: Download latest JDK {{ jdk_version }} release (Solaris) - command: wget {{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/solaris/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/eclipse?project=jdk -O /tmp/jdk-{{ jdk_version }}.tar.gz + command: wget {{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/solaris/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/{{ api_vendor }}?project=jdk -O /tmp/jdk-{{ jdk_version }}.tar.gz register: adoptopenjdk_download until: adoptopenjdk_download is not failed - name: Get Signature File Link (Solaris) - shell: curl -s '{{ api_url }}/v3/assets/latest/{{ jdk_version }}/{{ bootjdk }}?architecture={{ api_architecture }}&image_type=jdk&os=solaris&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' + shell: curl -s '{{ api_url }}/v3/assets/latest/{{ jdk_version }}/{{ bootjdk }}?architecture={{ api_architecture }}&image_type=jdk&os=solaris&vendor={{ vendor }}' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' register: sig_output - name: GPG Signature verification (Solaris) diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml index 5198ca3658..a245e45d9b 100644 --- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml @@ -12,19 +12,19 @@ set_fact: api_url: api.adoptium.net when: - - ( jdk_version == 8 || jdk_version == 11 || jdk_version >= 17 ) + - jdk_version == 8 or jdk_version == 11 or ( jdk_version | int >= 17) tags: adoptopenjdk_install - name: Use adoptopenjdk API if release is not supported by adoptium set_fact: api_url: api.adoptopenjdk.net when: - - ! ( jdk_version == 8 || jdk_version == 11 || jdk_version >= 17 ) + - jdk_version == 10 or jdk_version == 16 tags: adoptopenjdk_install - name: Download Temurin JDK {{ jdk_version }} win_get_url: - url: https://{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/windows/x64/jdk/{{ bootjdk }}/normal/adoptopenjdk?project=jdk + url: https://{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/windows/x64/jdk/{{ bootjdk }}/normal/eclipse?project=jdk dest: 'C:\temp\jdk-{{ jdk_version }}.zip' when: not java_installed.stat.exists tags: Java_install From 20e9e9d498a093e6d3858593b201ab72c99cc305 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Sun, 10 Mar 2024 17:47:18 +0000 Subject: [PATCH 12/17] Fix AIX Signed-off-by: Stewart X Addison --- .../roles/bootjdk/tasks/main.yml | 1 - .../roles/bootjdk/tasks/openjdk.yml | 47 +++++++------------ 2 files changed, 16 insertions(+), 32 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml index 0c4faba35d..ad1e3ca31c 100644 --- a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/main.yml @@ -19,7 +19,6 @@ - '11' - '16' - '17' - - '20' - '21' - name: Set /usr/java8_64 as default diff --git a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml index 07e1c6d498..8349b9d065 100644 --- a/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml +++ b/ansible/playbooks/AdoptOpenJDK_AIX_Playbook/roles/bootjdk/tasks/openjdk.yml @@ -8,17 +8,16 @@ heap: "normal" impl: "hotspot" adoptium_baseurl: "https://api.adoptium.net/v3/binary/latest" - adoptium_vendor: "eclipse" adoptopenjdk_baseurl: "https://api.adoptopenjdk.net/v3/binary/latest" - adoptopenjdk_vendor: "adoptopenjdk" - project: "{{ heap }}/{{ vendor }}?project=jdk" + adoptium_project: "{{ heap }}/eclipse?project=jdk" + adoptopenjdk_project: "{{ heap }}/adoptopenjdk?project=jdk" block: - name: Verify space in /usr include_tasks: chfs.yml - - name: Check for jdk {{ jdk }} availability + - name: Check for jdk {{ jdk }} availability in /usr/java{{ jdk }}_64 stat: - path: /usr/java{{ jdk }}_64 + path: /usr/java{{ jdk }}_64/bin/java register: java_installed - name: Download JDK {{ jdk }} binary from api.adoptopenjdk.net @@ -30,8 +29,8 @@ retries: 3 delay: 5 when: - - java_installed.stat.isdir is not defined - - jdk == 10 or jdk == 16 # These are the only two we still use from adoptopenjdk API + - not java_installed.stat.exists + - jdk == '10' or jdk == '16' # These are the only two we still use from adoptopenjdk API register: openjdk - name: Download JDK {{ jdk }} binary from api.adoptium.net @@ -43,36 +42,22 @@ retries: 3 delay: 5 when: - - java_installed.stat.isdir is not defined - - ! ( jdk == 10 or jdk == 16 ) - register: openjdk - - - name: Download JDK {{ jdk }} binary from api.adoptopenjdk.net - get_url: - url: "{{ adoptopenjdk_baseurl }}/{{ jdk }}/ga/{{ os_img }}/{{ impl }}/{{ project }}" - dest: /tmp/jdk{{ jdk }}.tar.gz - mode: 0440 - timeout: 25 - retries: 3 - delay: 5 - when: - - java_installed.stat.isdir is not defined - - jdk == 10 or jdk == 16 - + - not java_installed.stat.exists + - not ( jdk == '10' or jdk == '16' ) register: openjdk - name: Get Signature File Link shell: curl -s 'https://api.adoptium.net/v3/assets/latest/{{ jdk }}/hotspot?architecture=ppc64&image_type=jdk&os=aix&vendor=eclipse' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' when: - jdk != '10' and jdk != '16' - - java_installed.stat.isdir is not defined + - not java_installed.stat.exists register: sig_output - name: GPG Signature verification script: ../Supporting_Scripts/package_signature_verification.sh -f /tmp/jdk{{ jdk }}.tar.gz -sl "{{ sig_output.stdout }}" -k {{ key.adoptium }} when: - jdk != '10' and jdk != '16' - - java_installed.stat.isdir is not defined + - not java_installed.stat.exists - name: Install JDK {{ jdk }} binary unarchive: @@ -80,7 +65,7 @@ dest: /usr remote_src: yes when: - - java_installed.stat.isdir is not defined + - not java_installed.stat.exists - name: Report HTTP 404 message debug: @@ -94,7 +79,7 @@ path: /tmp/jdk{{ jdk }}.tar.gz state: absent when: - - java_installed.stat.isdir is not defined + - not java_installed.stat.exists # jdk8 directories do not have a hyphen - name: Find java 8 directory @@ -103,7 +88,7 @@ paths: /usr patterns: 'jdk8u*' when: - - java_installed.stat.isdir is not defined + - not java_installed.stat.exists - jdk == '8' register: java8_directory @@ -113,7 +98,7 @@ paths: /usr patterns: 'jdk-{{ jdk }}*' when: - - java_installed.stat.isdir is not defined + - not java_installed.stat.exists - jdk != '8' register: java_directory @@ -126,7 +111,7 @@ with_items: - "{{ java8_directory.files }}" when: - - java_installed.stat.isdir is not defined + - not java_installed.stat.exists - jdk == '8' - name: Symlink to java{{ jdk }}_64 @@ -137,7 +122,7 @@ with_items: - "{{ java_directory.files }}" when: - - java_installed.stat.isdir is not defined + - not java_installed.stat.exists - jdk != '8' # Defaults for BootJDK API # AdoptOpenJDK changes to Adoptium: From a19d014d0d06a5067c7cac3aa536058a61118cba Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Sun, 10 Mar 2024 23:57:47 +0000 Subject: [PATCH 13/17] Sort Windows Signed-off-by: Stewart X Addison --- .../roles/Java_install/tasks/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml index a245e45d9b..6786ce4313 100644 --- a/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Windows_Playbook/roles/Java_install/tasks/main.yml @@ -11,20 +11,22 @@ - name: Use adoptium API if release is available at adoptium set_fact: api_url: api.adoptium.net + api_vendor: eclipse when: - - jdk_version == 8 or jdk_version == 11 or ( jdk_version | int >= 17) + - jdk_version == '8' or jdk_version == '11' or ( jdk_version | int >= 17) tags: adoptopenjdk_install - name: Use adoptopenjdk API if release is not supported by adoptium set_fact: api_url: api.adoptopenjdk.net + api_vendor: adoptopenjdk when: - jdk_version == 10 or jdk_version == 16 tags: adoptopenjdk_install - name: Download Temurin JDK {{ jdk_version }} win_get_url: - url: https://{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/windows/x64/jdk/{{ bootjdk }}/normal/eclipse?project=jdk + url: https://{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/windows/x64/jdk/{{ bootjdk }}/normal/{{ api_vendor }}?project=jdk dest: 'C:\temp\jdk-{{ jdk_version }}.zip' when: not java_installed.stat.exists tags: Java_install From ef9866f7f00112252e8f8d85b4dc1d06a0d512f4 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Mon, 11 Mar 2024 09:26:37 +0000 Subject: [PATCH 14/17] Solaris, riscv64 and CentO6 fixup Signed-off-by: Stewart X Addison --- ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml | 3 ++- .../roles/adoptopenjdk_install/tasks/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml index 107ce03e81..6fb692ee3e 100644 --- a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml +++ b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/main.yml @@ -118,11 +118,12 @@ when: - ansible_distribution != "Alpine" - ansible_distribution != "Solaris" + - ansible_architecture != "riscv64" tags: build_tools - role: adoptopenjdk_install # Current LTS jdk_version: 21 when: - - ansible_architecture != "Solaris" + - ansible_distribution != "Solaris" - ansible_architecture != "armv7l" tags: build_tools - role: Nagios_Plugins # AdoptOpenJDK Infrastructure 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 25358ba3cd..b620434506 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 @@ -321,7 +321,7 @@ tags: adoptopenjdk_install block: - name: Download latest JDK {{ jdk_version }} release (CentOS6) - command: wget -q '{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/{{ vendor }}?project=jdk' -O /tmp/jdk{{ jdk_version }}.tar.gz + command: wget -q '{{ api_url }}/v3/binary/latest/{{ jdk_version }}/ga/{{ platformLinux }}/{{ api_architecture }}/jdk/{{ bootjdk }}/normal/{{ api_vendor }}?project=jdk' -O /tmp/jdk{{ jdk_version }}.tar.gz vars: ansible_python_interpreter: /usr/local/python2/bin/python2.7 retries: 3 @@ -433,7 +433,7 @@ until: adoptopenjdk_download is not failed - name: Get Signature File Link (Solaris) - shell: curl -s '{{ api_url }}/v3/assets/latest/{{ jdk_version }}/{{ bootjdk }}?architecture={{ api_architecture }}&image_type=jdk&os=solaris&vendor={{ vendor }}' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' + shell: curl -s '{{ api_url }}/v3/assets/latest/{{ jdk_version }}/{{ bootjdk }}?architecture={{ api_architecture }}&image_type=jdk&os=solaris&vendor={{ api_vendor }}' | grep signature_link | awk '{split($0,a,"\""); print a[4]}' register: sig_output - name: GPG Signature verification (Solaris) From 054fa628effb357492a895aa605d63ebe066245e Mon Sep 17 00:00:00 2001 From: Adam Farley Date: Mon, 11 Mar 2024 13:45:56 +0000 Subject: [PATCH 15/17] Update ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adoptopenjdk_install/tasks/main.yml Removing double space --- .../roles/adoptopenjdk_install/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b620434506..7db3cb04ad 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 @@ -1,6 +1,6 @@ --- ############################################################### -# ansible install adopt binary into /usr/lib/jvm/JDK_VERSION # +# ansible install adopt binary into /usr/lib/jvm/JDK_VERSION # ############################################################### # Conditions: From 5e9d9e2d43453d084b1b39f409e3d1cf2fc9fcfd Mon Sep 17 00:00:00 2001 From: Adam Farley Date: Mon, 11 Mar 2024 13:47:16 +0000 Subject: [PATCH 16/17] Update ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adoptopenjdk_install/tasks/main.yml Lining up comment hashes. --- .../roles/adoptopenjdk_install/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7db3cb04ad..8601d79572 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 @@ -1,5 +1,5 @@ --- -############################################################### +############################################################## # ansible install adopt binary into /usr/lib/jvm/JDK_VERSION # ############################################################### From a33750bbe48c5614b15b52acd8cc31f7a05f5e63 Mon Sep 17 00:00:00 2001 From: Adam Farley Date: Mon, 11 Mar 2024 13:48:04 +0000 Subject: [PATCH 17/17] Update ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/adoptopenjdk_install/tasks/main.yml Lining up comment hashes. --- .../roles/adoptopenjdk_install/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8601d79572..d7e0c79261 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 @@ -1,7 +1,7 @@ --- ############################################################## # ansible install adopt binary into /usr/lib/jvm/JDK_VERSION # -############################################################### +############################################################## # Conditions: # Check if target is installed