#210 - Migrate to Adoptium temurin. Remove old deprecated repositories

Author: sorobon

.yamllint

@@ -12,7 +12,6 @@ rules:
   # NOTE(retr0h): Templates no longer fail this lint rule.
   #               Uncomment if running old Molecule templates.
   # truthy: disable
-
 ignore: |
   tests/
   .travis.yml

tasks/install_openjdk.yml

@@ -5,7 +5,6 @@
     java_jdk_vendor: "temurin"
   when: "java_jdk_vendor == 'adoptopenjdk'"
 
-
 - name: Java | Gather OS specific variables
   include_vars: "{{ item }}"
   with_first_found:
@@ -24,6 +23,7 @@
     java_required_repositories_openjdk: "{{ java_required_repositories_openjdk if java_required_repositories_openjdk is defined and java_required_repositories_openjdk is not sameas None and java_required_repositories_openjdk | length else __java_required_repositories_openjdk }}"
     java_required_key_repositories_openjdk: "{{ java_required_key_repositories_openjdk if java_required_key_repositories_openjdk is defined and java_required_key_repositories_openjdk is not sameas None and java_required_key_repositories_openjdk | length  else __java_required_key_repositories_openjdk }}"
     java_required_libs_openjdk: "{{ java_required_libs_openjdk if java_required_libs_openjdk is defined and java_required_libs_openjdk is not sameas None and java_required_libs_openjdk | length else __java_required_libs_openjdk }}"
+    java_deprecated_repositories_adoptopenjdk: "{{ java_deprecated_repositories_adoptopenjdk if java_deprecated_repositories_adoptopenjdk is defined and java_deprecated_repositories_adoptopenjdk is not sameas None and java_deprecated_repositories_adoptopenjdk | length else __java_deprecated_repositories_adoptopenjdk }}"
 
 - name: Java | Setting OS and architecture specific variables (II)
   set_fact:
@@ -36,6 +36,11 @@
 
 - name: Java | Debian pre-requisites
   block:
+    - name: Java | Remove deprecated repositories
+      apt_repository:
+        repo: "{{ item }}"
+        state: absent
+      with_items: "{{ java_deprecated_repositories_adoptopenjdk }}"
     - name: Java | Install extra apt tools
       package:
         name: "{{ java_open_jdk_apt_extra_packages }}"
@@ -119,15 +124,15 @@
   alternatives:
     name: java
     path: "/usr/lib/jvm/{{ java_open_jdk_home_dir }}/jre/bin/java"
-  when: 
-    - ansible_os_family == 'Debian' 
+  when:
+    - ansible_os_family == 'Debian'
     - java_open_jdk_version_major | int < 11
 
 
 - name: "Correct java version selected /usr/lib/jvm/{{ java_open_jdk_home_dir }}/bin/java in java >= 11"
   alternatives:
     name: java
     path: "/usr/lib/jvm/{{ java_open_jdk_home_dir }}/bin/java"
-  when: 
-    - ansible_os_family == 'Debian' 
+  when:
+    - ansible_os_family == 'Debian'
     - java_open_jdk_version_major | int >= 11

vars/temurin/Debian-10.yml

@@ -15,3 +15,5 @@ __java_required_repositories_openjdk:
   - deb https://packages.adoptium.net/artifactory/deb {{ ansible_distribution_release }} main
 __java_open_jdk_home_dir: temurin-{{ java_open_jdk_version_major }}-jdk-{{ java_open_jdk_home_dir_suffix }}
 __java_open_jdk_package: temurin-{{ java_open_jdk_version_major }}-jdk
+__java_deprecated_repositories_adoptopenjdk:
+  - deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ {{ ansible_distribution_release }} main

vars/temurin/Debian-11.yml

@@ -15,3 +15,5 @@ __java_required_repositories_openjdk:
   - deb https://packages.adoptium.net/artifactory/deb {{ ansible_distribution_release }} main
 __java_open_jdk_home_dir: temurin-{{ java_open_jdk_version_major }}-jdk-{{ java_open_jdk_home_dir_suffix }}
 __java_open_jdk_package: temurin-{{ java_open_jdk_version_major }}-jdk
+__java_deprecated_repositories_adoptopenjdk:
+  - deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ {{ ansible_distribution_release }} main

vars/temurin/Debian-12.yml

@@ -15,3 +15,5 @@ __java_required_repositories_openjdk:
   - deb https://packages.adoptium.net/artifactory/deb {{ ansible_distribution_release }} main
 __java_open_jdk_home_dir: temurin-{{ java_open_jdk_version_major }}-jdk-{{ java_open_jdk_home_dir_suffix }}
 __java_open_jdk_package: temurin-{{ java_open_jdk_version_major }}-jdk
+__java_deprecated_repositories_adoptopenjdk:
+  - deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ {{ ansible_distribution_release }} main

vars/temurin/Debian-9.yml

@@ -15,3 +15,5 @@ __java_required_repositories_openjdk:
   - deb https://packages.adoptium.net/artifactory/deb {{ ansible_distribution_release }} main
 __java_open_jdk_home_dir: temurin-{{ java_open_jdk_version_major }}-jdk-{{ java_open_jdk_home_dir_suffix }}
 __java_open_jdk_package: temurin-{{ java_open_jdk_version_major }}-jdk
+__java_deprecated_repositories_adoptopenjdk:
+  - deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ {{ ansible_distribution_release }} main

vars/temurin/Ubuntu-20.yml

@@ -14,3 +14,5 @@ __java_required_repositories_openjdk:
   - deb https://packages.adoptium.net/artifactory/deb {{ ansible_distribution_release }} main
 __java_open_jdk_home_dir: temurin-{{ java_open_jdk_version_major }}-jdk-{{ java_open_jdk_home_dir_suffix }}
 __java_open_jdk_package: temurin-{{ java_open_jdk_version_major }}-jdk
+__java_deprecated_repositories_adoptopenjdk:
+  - deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ {{ ansible_distribution_release }} main

vars/temurin/Ubuntu-22.yml

@@ -14,3 +14,5 @@ __java_required_repositories_openjdk:
   - deb https://packages.adoptium.net/artifactory/deb {{ ansible_distribution_release }} main
 __java_open_jdk_home_dir: temurin-{{ java_open_jdk_version_major }}-jdk-{{ java_open_jdk_home_dir_suffix }}
 __java_open_jdk_package: temurin-{{ java_open_jdk_version_major }}-jdk
+__java_deprecated_repositories_adoptopenjdk:
+  - deb https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ {{ ansible_distribution_release }} main