From: Anil Belur <abelur@linuxfoundation.org>
Date: Wed, 10 Jul 2019 23:12:41 +0000 (+1000)
Subject: Add OpenJDK 12 support for CentOS7 and Ubuntu
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=acd282a8d40593537b952943a080595659607cbb;p=ansible%2Froles%2Fjava-install.git

Add OpenJDK 12 support for CentOS7 and Ubuntu

This requires adding the epel-release repo without
which molecule test would fail, since the repos is
not available in the docker container pulled in by
the molecule test.

Issue: RELENG-2202
Change-Id: Id7a8cc988abb1ac884d73b37d2bacb054f649dbf
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/tasks/Debian.yml b/tasks/Debian.yml
index 0e2ef9c..27b6105 100644
--- a/tasks/Debian.yml
+++ b/tasks/Debian.yml
@@ -4,19 +4,17 @@
     repo: 'ppa:openjdk-r/ppa'
   become: true
 
-- name: Install Java 7 SDK
-  apt: name=openjdk-7-jdk state=present update_cache=yes
+- name: Install OpenJDK 1.7.0, 1.8.0, 1.11 and 1.12
+  apt:
+    name:
+      - openjdk-7-jdk
+      - openjdk-8-jdk
+      - openjdk-11-jdk
+      - openjdk-12-jdk
+    state: present
+    update_cache: 'yes'
   become: true
-  when: ansible_distribution_version < '18.04'
 
-- name: Install Java 8 SDK
-  apt: name=openjdk-8-jdk state=present update_cache=yes
-  become: true
-
-- name: Install Java 11 SDK
-  apt: name=openjdk-11-jdk state=present update_cache=yes
-  become: true
-
-- name: Set Java path
+- name: Set Java path for OpenJDK 1.8.0
   set_fact:
     java_path: /usr/lib/jvm/java-1.8.0-openjdk-amd64
diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index 92ea0b6..2bc1451 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -1,13 +1,18 @@
 ---
-- name: Install OpenJDK 1.7.0, 1.8.0 and 1.11
+- name: Install Epel Repo
+  package: name=epel-release state=present
+  when: ansible_os_family == "RedHat"
+
+- name: Install OpenJDK 1.7.0, 1.8.0, 1.11 and 1.12
   yum:
     name:
       - java-1.7.0-openjdk-devel
       - java-1.8.0-openjdk-devel
       - java-11-openjdk-devel
+      - java-latest-openjdk-devel
     state: present
   become: true
 
-- name: Set Java path
+- name: Set Java path for OpenJDK 1.8.0
   set_fact:
     java_path: /usr/lib/jvm/java-1.8.0-openjdk