From 983e3fc2bbc7da56dd6d3e2b55df560e3f494251 Mon Sep 17 00:00:00 2001
From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com>
Date: Sun, 10 May 2026 11:59:17 +0200
Subject: [PATCH] [PR #12023/87a42725 backport][stable-12]
 java_cert/java_keystore: re-enable RHEL tests (#12027)

java_cert/java_keystore: re-enable RHEL tests (#12023)

* java_cert/java_keystore: re-enable RHEL tests

* bump java to version 21 in RHEL

(cherry picked from commit 87a42725e0020f18754dc24675ece331b4ba1f5c)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
---
 tests/integration/targets/java_cert/aliases                  | 1 -
 tests/integration/targets/java_keystore/aliases              | 1 -
 tests/integration/targets/setup_java_keytool/vars/RedHat.yml | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/integration/targets/java_cert/aliases b/tests/integration/targets/java_cert/aliases
index 50b80ecbe7..6517e5a05e 100644
--- a/tests/integration/targets/java_cert/aliases
+++ b/tests/integration/targets/java_cert/aliases
@@ -7,4 +7,3 @@ destructive
 skip/macos
 skip/freebsd
 needs/root
-skip/rhel  # FIXME: keytool seems to be broken on newer RHELs
diff --git a/tests/integration/targets/java_keystore/aliases b/tests/integration/targets/java_keystore/aliases
index 50b80ecbe7..6517e5a05e 100644
--- a/tests/integration/targets/java_keystore/aliases
+++ b/tests/integration/targets/java_keystore/aliases
@@ -7,4 +7,3 @@ destructive
 skip/macos
 skip/freebsd
 needs/root
-skip/rhel  # FIXME: keytool seems to be broken on newer RHELs
diff --git a/tests/integration/targets/setup_java_keytool/vars/RedHat.yml b/tests/integration/targets/setup_java_keytool/vars/RedHat.yml
index 8f4126e5dc..5f77ea9bba 100644
--- a/tests/integration/targets/setup_java_keytool/vars/RedHat.yml
+++ b/tests/integration/targets/setup_java_keytool/vars/RedHat.yml
@@ -4,4 +4,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 keytool_package_names:
-  - java-11-openjdk-headless
+  - java-21-openjdk-headless