From: Anil Belur <abelur@linuxfoundation.org>
Date: Wed, 10 Aug 2022 23:31:08 +0000 (+1000)
Subject: Fix: Remove JDK17 for CentOS7
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F77%2F70477%2F3;p=ansible%2Froles%2Fjava-install.git

Fix: Remove JDK17 for CentOS7

- Packer build fails to find JDK17 packages for CentOS7.
- Adjust molecule deps for CentOS8 streams.

Issue-ID: IT-24376
Change-Id: I251e031792793ae33beda6eaca63bf2aca46f0a1
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 2d3f443..7274ab6 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -11,7 +11,7 @@ platforms:
   - name: centos7
     image: centos:7
   - name: centos8
-    image: centos:8
+    image: quay.io/pycontribs/centos:stream8
   - name: ubuntu1804
     image: ubuntu:18.04
   - name: ubuntu2004
diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml
index ad100cc..90dec8e 100644
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@@ -4,12 +4,11 @@
   when: ansible_os_family == "RedHat"
   become: true
 
-- name: Install OpenJDK 1.8.0, 11 and 17
+- name: Install OpenJDK 1.8.0, 11
   yum:
     name:
       - java-1.8.0-openjdk-devel
       - java-11-openjdk-devel
-      - java-17-openjdk-devel
       - java-latest-openjdk-devel
     state: present
   become: true