From: Eric Ball <eball@linuxfoundation.org>
Date: Fri, 6 Jun 2025 19:05:43 +0000 (-0700)
Subject: Update tasks and tests for Ubuntu 24.04
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F96%2F73496%2F1;p=ansible%2Froles%2Fjava-install.git

Update tasks and tests for Ubuntu 24.04

Change-Id: I0e406434cd07a0ba87b2698d02bdbca287002977
Signed-off-by: Eric Ball <eball@linuxfoundation.org>
---

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 6e63070..e6194ba 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -16,6 +16,8 @@ platforms:
     image: ubuntu:20.04
   - name: ubuntu2204
     image: ubuntu:22.04
+  - name: ubuntu2404
+    image: ubuntu:24.04
 provisioner:
   name: ansible
   # Fix for role path finding in latest molecule versions (~25.4.0)
diff --git a/tasks/Debian.yml b/tasks/Debian.yml
index 4e08744..e318408 100644
--- a/tasks/Debian.yml
+++ b/tasks/Debian.yml
@@ -48,8 +48,7 @@
   become: true
   when:
     - ansible_os_family == "Debian"
-    - ansible_distribution_major_version == "13" or ansible_distribution_version == "20.04" or
-      ansible_distribution_version == "22.04"
+    - ansible_distribution_major_version == "13" or ansible_distribution_version >= "20.04"
 
 - name: Set Java path for OpenJDK 11 (non-arm)
   ansible.builtin.set_fact: