From: Yuval Lifshitz <ylifshit@redhat.com>
Date: Thu, 22 Feb 2024 09:58:00 +0000 (+0000)
Subject: test/rgw/notifications: split tests between basic, kafka and amqp
X-Git-Tag: v19.1.0~104^2~39
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bddf90ff7674b48de6440dcb0d4be648caf98f8d;p=ceph.git

test/rgw/notifications: split tests between basic, kafka and amqp

see comment: https://tracker.ceph.com/issues/64184#note-3

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>
(cherry picked from commit 6f28930602a2dfdcd402537c1a274df1836109ce)
---

diff --git a/qa/suites/rgw/notifications/centos_latest.yaml b/qa/suites/rgw/notifications/centos_latest.yaml
deleted file mode 120000
index bd9854e7029..00000000000
--- a/qa/suites/rgw/notifications/centos_latest.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/distros/supported/centos_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/notifications/tasks/+ b/qa/suites/rgw/notifications/tasks/+
deleted file mode 100644
index e69de29bb2d..00000000000
diff --git a/qa/suites/rgw/notifications/tasks/0-install.yaml b/qa/suites/rgw/notifications/tasks/0-install.yaml
deleted file mode 100644
index 5c83d5c0d23..00000000000
--- a/qa/suites/rgw/notifications/tasks/0-install.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-tasks:
-- install:
-- ceph:
-- openssl_keys:
-- rgw:
-    client.0:
-
-overrides:
-  install:
-    ceph:
-      extra_system_packages:
-        rpm:
-        - java
-        deb:
-        - default-jre
-  ceph:
-    conf:
-      global:
-        osd_min_pg_log_entries: 10
-        osd_max_pg_log_entries: 10
diff --git a/qa/suites/rgw/notifications/tasks/amqp/+ b/qa/suites/rgw/notifications/tasks/amqp/+
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/rgw/notifications/tasks/amqp/0-install.yaml b/qa/suites/rgw/notifications/tasks/amqp/0-install.yaml
new file mode 100644
index 00000000000..9e7852d4d25
--- /dev/null
+++ b/qa/suites/rgw/notifications/tasks/amqp/0-install.yaml
@@ -0,0 +1,13 @@
+tasks:
+- install:
+- ceph:
+- openssl_keys:
+- rgw:
+    client.0:
+
+overrides:
+  ceph:
+    conf:
+      global:
+        osd_min_pg_log_entries: 10
+        osd_max_pg_log_entries: 10
diff --git a/qa/suites/rgw/notifications/tasks/amqp/centos_latest.yaml b/qa/suites/rgw/notifications/tasks/amqp/centos_latest.yaml
new file mode 120000
index 00000000000..a7df972290a
--- /dev/null
+++ b/qa/suites/rgw/notifications/tasks/amqp/centos_latest.yaml
@@ -0,0 +1 @@
+../../.qa/distros/supported/centos_latest.yaml
\ No newline at end of file
diff --git a/qa/suites/rgw/notifications/tasks/amqp/test_amqp.yaml b/qa/suites/rgw/notifications/tasks/amqp/test_amqp.yaml
new file mode 100644
index 00000000000..6807cfb6587
--- /dev/null
+++ b/qa/suites/rgw/notifications/tasks/amqp/test_amqp.yaml
@@ -0,0 +1,7 @@
+tasks:
+- rabbitmq:
+    client.0:
+- notification-tests:
+    client.0:
+      extra_attr: ["amqp_test"]
+      rgw_server: client.0
diff --git a/qa/suites/rgw/notifications/tasks/kafka/+ b/qa/suites/rgw/notifications/tasks/kafka/+
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/rgw/notifications/tasks/kafka/0-install.yaml b/qa/suites/rgw/notifications/tasks/kafka/0-install.yaml
new file mode 100644
index 00000000000..5c83d5c0d23
--- /dev/null
+++ b/qa/suites/rgw/notifications/tasks/kafka/0-install.yaml
@@ -0,0 +1,20 @@
+tasks:
+- install:
+- ceph:
+- openssl_keys:
+- rgw:
+    client.0:
+
+overrides:
+  install:
+    ceph:
+      extra_system_packages:
+        rpm:
+        - java
+        deb:
+        - default-jre
+  ceph:
+    conf:
+      global:
+        osd_min_pg_log_entries: 10
+        osd_max_pg_log_entries: 10
diff --git a/qa/suites/rgw/notifications/tasks/kafka/supported-distros b/qa/suites/rgw/notifications/tasks/kafka/supported-distros
new file mode 120000
index 00000000000..46280a42a96
--- /dev/null
+++ b/qa/suites/rgw/notifications/tasks/kafka/supported-distros
@@ -0,0 +1 @@
+../../.qa/distros/supported-random-distro$/
\ No newline at end of file
diff --git a/qa/suites/rgw/notifications/tasks/kafka/test_kafka.yaml b/qa/suites/rgw/notifications/tasks/kafka/test_kafka.yaml
new file mode 100644
index 00000000000..ae647df3865
--- /dev/null
+++ b/qa/suites/rgw/notifications/tasks/kafka/test_kafka.yaml
@@ -0,0 +1,8 @@
+tasks:
+- kafka:
+    client.0:
+      kafka_version: 2.6.0
+- notification-tests:
+    client.0:
+      extra_attr: ["kafka_test"]
+      rgw_server: client.0
diff --git a/qa/suites/rgw/notifications/tasks/others/+ b/qa/suites/rgw/notifications/tasks/others/+
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/qa/suites/rgw/notifications/tasks/others/0-install.yaml b/qa/suites/rgw/notifications/tasks/others/0-install.yaml
new file mode 100644
index 00000000000..9e7852d4d25
--- /dev/null
+++ b/qa/suites/rgw/notifications/tasks/others/0-install.yaml
@@ -0,0 +1,13 @@
+tasks:
+- install:
+- ceph:
+- openssl_keys:
+- rgw:
+    client.0:
+
+overrides:
+  ceph:
+    conf:
+      global:
+        osd_min_pg_log_entries: 10
+        osd_max_pg_log_entries: 10
diff --git a/qa/suites/rgw/notifications/tasks/others/supported-distros b/qa/suites/rgw/notifications/tasks/others/supported-distros
new file mode 120000
index 00000000000..46280a42a96
--- /dev/null
+++ b/qa/suites/rgw/notifications/tasks/others/supported-distros
@@ -0,0 +1 @@
+../../.qa/distros/supported-random-distro$/
\ No newline at end of file
diff --git a/qa/suites/rgw/notifications/tasks/others/test_others.yaml b/qa/suites/rgw/notifications/tasks/others/test_others.yaml
new file mode 100644
index 00000000000..793f6f43024
--- /dev/null
+++ b/qa/suites/rgw/notifications/tasks/others/test_others.yaml
@@ -0,0 +1,4 @@
+tasks:
+- notification-tests:
+    client.0:
+      rgw_server: client.0
diff --git a/qa/suites/rgw/notifications/tasks/test_amqp.yaml b/qa/suites/rgw/notifications/tasks/test_amqp.yaml
deleted file mode 100644
index 6807cfb6587..00000000000
--- a/qa/suites/rgw/notifications/tasks/test_amqp.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-tasks:
-- rabbitmq:
-    client.0:
-- notification-tests:
-    client.0:
-      extra_attr: ["amqp_test"]
-      rgw_server: client.0
diff --git a/qa/suites/rgw/notifications/tasks/test_kafka.yaml b/qa/suites/rgw/notifications/tasks/test_kafka.yaml
deleted file mode 100644
index ae647df3865..00000000000
--- a/qa/suites/rgw/notifications/tasks/test_kafka.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-tasks:
-- kafka:
-    client.0:
-      kafka_version: 2.6.0
-- notification-tests:
-    client.0:
-      extra_attr: ["kafka_test"]
-      rgw_server: client.0
diff --git a/qa/suites/rgw/notifications/tasks/test_others.yaml b/qa/suites/rgw/notifications/tasks/test_others.yaml
deleted file mode 100644
index 793f6f43024..00000000000
--- a/qa/suites/rgw/notifications/tasks/test_others.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-tasks:
-- notification-tests:
-    client.0:
-      rgw_server: client.0