Updates following linter failures

Signed-off-by: Stewart X Addison <sxa@redhat.com>
adoptium · Mar 8, 2024 · 38d7188 · 38d7188
1 parent fba53aa
commit 38d7188
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 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
@@ -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
@@ -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
@@ -22,19 +22,21 @@
     - ! ( 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: {{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
+    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
+    - jdk_version==10 or jdk_version==16
   tags: Java_install
 
 - name: Install Java{{ jdk_version }}