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 <kapandya@redhat.com>

diff --git a/qa/suites/rgw/notifications/tasks/test_kafka.yaml b/qa/suites/rgw/notifications/tasks/test_kafka.yaml
index 36b30c4975f1effe47bcba30383e82649fba1554..dad9c47ddb5f2f02217da2534eed277f2ebd38de 100644 (file)
--- 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 93d9db3d3487d336455ef717605ce36fcc0f2dee..d4b3e08fe4201aa4aa25dc1e8f24aeb3bc966941 100644 (file)
--- 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],
             )