From: Sage Weil <sage@redhat.com>
Date: Wed, 18 Dec 2019 22:58:50 +0000 (-0600)
Subject: qa/tasks/s3tests_java: move to gradle 6.0.1
X-Git-Tag: v15.1.0~430^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F32335%2Fhead;p=ceph.git

qa/tasks/s3tests_java: move to gradle 6.0.1

Also switch to using a stable symlink so that the version is determined by the branch.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/qa/tasks/s3tests_java.py b/qa/tasks/s3tests_java.py
index e14bb5ea7dd1..5ccf46e8a43d 100644
--- a/qa/tasks/s3tests_java.py
+++ b/qa/tasks/s3tests_java.py
@@ -314,7 +314,7 @@ class S3tests_java(Task):
             args = ['cd',
                     '{tdir}/s3-tests-java'.format(tdir=testdir),
                     run.Raw('&&'),
-                    '/opt/gradle/gradle-4.7/bin/gradle', 'clean', 'test',
+                    '/opt/gradle/gradle/bin/gradle', 'clean', 'test',
                     '--rerun-tasks', '--no-build-cache',
                     ]
             extra_args = []