From d19578ffa770df769e51d471425fc9aec0b38316 Mon Sep 17 00:00:00 2001 From: "J. Eric Ivancich" Date: Mon, 6 Apr 2026 20:53:34 -0400 Subject: [PATCH] rgw/test: enhanced java s3-tests change setting of JAVA_HOME Under Centos 9 the Java 8 version is recognized by the substring "java-1.8" rather than "java-8". So the grep has been modified to accept either. Signed-off-by: J. Eric Ivancich (cherry picked from commit a49d4446e4d84b28273b460b85a193011a9c4ed8) --- qa/tasks/s3tests_java.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/tasks/s3tests_java.py b/qa/tasks/s3tests_java.py index 03ba946e7820..0fe5b12f8556 100644 --- a/qa/tasks/s3tests_java.py +++ b/qa/tasks/s3tests_java.py @@ -284,7 +284,7 @@ class S3tests_java(Task): args = ['cd', '{tdir}/s3-tests-java'.format(tdir=testdir), run.Raw('&&'), - run.Raw('JAVA_HOME=$(ls -d /usr/lib/jvm/* | grep java-8 | head -n 1)'), + run.Raw('JAVA_HOME=$(ls -d /usr/lib/jvm/* | grep -E java-8\|java-1\.8 | head -n 1)'), '/opt/gradle/gradle/bin/gradle', 'clean', 'test', '--rerun-tasks', '--no-build-cache', ] -- 2.47.3