]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/rgw: force Hadoop to run under Java 1.8 61121/head
authorJ. Eric Ivancich <ivancich@redhat.com>
Mon, 16 Dec 2024 18:21:35 +0000 (13:21 -0500)
committerJ. Eric Ivancich <ivancich@redhat.com>
Tue, 17 Dec 2024 18:21:05 +0000 (13:21 -0500)
The Hadoop test installs Java 1.8 but then just runs the default
version. This makes sure it will run the version it installed.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
(cherry picked from commit c5503187af96dc0179265dc84b2716df851e4cdf)

qa/tasks/s3a_hadoop.py

index 7b77359fcf2bb8a3c86dc9e9e0a2297a827f95b3..2e5aeebb9b6ddaad1f7c04d2f695cb65615d5eed 100644 (file)
@@ -204,6 +204,7 @@ def run_s3atest(client, maven_version, testdir, test_options):
             run.Raw('&&'),
             run.Raw(rm_test),
             run.Raw('&&'),
+            run.Raw('JAVA_HOME=$(alternatives --list | grep jre_1.8.0 | head -n 1 | awk \'{print $3}\')'),
             run.Raw(run_test),
             run.Raw(test_options)
         ]