From: Kalpesh Date: Tue, 6 Apr 2021 15:59:43 +0000 (+0530) Subject: rgw/test: Changing force-branch to master X-Git-Tag: v17.1.0~2321^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=42d87989e9ff4572c9f1fb031868f6b562f7ae35;p=ceph.git rgw/test: Changing force-branch to master This PR includes 2 things: 1. Changing force-branch to master and removing the git-remote. This change was forgetten for PR #39139. 2. Proper cleanup/removal after completion of commands more precisely removing the kafka logs directory. Signed-off-by: Kalpesh Pandya --- diff --git a/qa/suites/rgw/notifications/tasks/test_kafka.yaml b/qa/suites/rgw/notifications/tasks/test_kafka.yaml index 36b30c4975f1e..dad9c47ddb5f2 100644 --- a/qa/suites/rgw/notifications/tasks/test_kafka.yaml +++ b/qa/suites/rgw/notifications/tasks/test_kafka.yaml @@ -5,6 +5,5 @@ tasks: kafka_version: 2.6.0 - notification-tests: client.0: - force-branch: wip-rgw-bucket-tests-separation-new + force-branch: master rgw_server: client.0 - git_remote: https://github.com/TRYTOBE8TME/ diff --git a/qa/tasks/kafka.py b/qa/tasks/kafka.py index 93d9db3d3487d..d4b3e08fe4201 100644 --- a/qa/tasks/kafka.py +++ b/qa/tasks/kafka.py @@ -55,6 +55,10 @@ def install_kafka(ctx, config): test_dir=get_kafka_dir(ctx, config) current_version = get_kafka_version(config) for client in config: + ctx.cluster.only(client).run( + args=['rm', '-rf', '{tdir}/logs'.format(tdir=test_dir)], + ) + ctx.cluster.only(client).run( args=['rm', '-rf', test_dir], )