From 6f28930602a2dfdcd402537c1a274df1836109ce Mon Sep 17 00:00:00 2001 From: Yuval Lifshitz Date: Thu, 22 Feb 2024 09:58:00 +0000 Subject: [PATCH] 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 --- qa/suites/rgw/notifications/centos_latest.yaml | 1 - qa/suites/rgw/notifications/tasks/{ => amqp}/+ | 0 .../rgw/notifications/tasks/amqp/0-install.yaml | 13 +++++++++++++ .../rgw/notifications/tasks/amqp/centos_latest.yaml | 1 + .../notifications/tasks/{ => amqp}/test_amqp.yaml | 0 qa/suites/rgw/notifications/tasks/kafka/+ | 0 .../notifications/tasks/{ => kafka}/0-install.yaml | 0 .../rgw/notifications/tasks/kafka/supported-distros | 1 + .../notifications/tasks/{ => kafka}/test_kafka.yaml | 0 qa/suites/rgw/notifications/tasks/others/+ | 0 .../rgw/notifications/tasks/others/0-install.yaml | 13 +++++++++++++ .../notifications/tasks/others/supported-distros | 1 + .../tasks/{ => others}/test_others.yaml | 0 13 files changed, 29 insertions(+), 1 deletion(-) delete mode 120000 qa/suites/rgw/notifications/centos_latest.yaml rename qa/suites/rgw/notifications/tasks/{ => amqp}/+ (100%) create mode 100644 qa/suites/rgw/notifications/tasks/amqp/0-install.yaml create mode 120000 qa/suites/rgw/notifications/tasks/amqp/centos_latest.yaml rename qa/suites/rgw/notifications/tasks/{ => amqp}/test_amqp.yaml (100%) create mode 100644 qa/suites/rgw/notifications/tasks/kafka/+ rename qa/suites/rgw/notifications/tasks/{ => kafka}/0-install.yaml (100%) create mode 120000 qa/suites/rgw/notifications/tasks/kafka/supported-distros rename qa/suites/rgw/notifications/tasks/{ => kafka}/test_kafka.yaml (100%) create mode 100644 qa/suites/rgw/notifications/tasks/others/+ create mode 100644 qa/suites/rgw/notifications/tasks/others/0-install.yaml create mode 120000 qa/suites/rgw/notifications/tasks/others/supported-distros rename qa/suites/rgw/notifications/tasks/{ => others}/test_others.yaml (100%) diff --git a/qa/suites/rgw/notifications/centos_latest.yaml b/qa/suites/rgw/notifications/centos_latest.yaml deleted file mode 120000 index bd9854e702982..0000000000000 --- 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/amqp/+ similarity index 100% rename from qa/suites/rgw/notifications/tasks/+ rename to qa/suites/rgw/notifications/tasks/amqp/+ 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 0000000000000..9e7852d4d25fa --- /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 0000000000000..a7df972290a49 --- /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/test_amqp.yaml b/qa/suites/rgw/notifications/tasks/amqp/test_amqp.yaml similarity index 100% rename from qa/suites/rgw/notifications/tasks/test_amqp.yaml rename to qa/suites/rgw/notifications/tasks/amqp/test_amqp.yaml diff --git a/qa/suites/rgw/notifications/tasks/kafka/+ b/qa/suites/rgw/notifications/tasks/kafka/+ new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/qa/suites/rgw/notifications/tasks/0-install.yaml b/qa/suites/rgw/notifications/tasks/kafka/0-install.yaml similarity index 100% rename from qa/suites/rgw/notifications/tasks/0-install.yaml rename to qa/suites/rgw/notifications/tasks/kafka/0-install.yaml 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 0000000000000..46280a42a96d6 --- /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/test_kafka.yaml b/qa/suites/rgw/notifications/tasks/kafka/test_kafka.yaml similarity index 100% rename from qa/suites/rgw/notifications/tasks/test_kafka.yaml rename to qa/suites/rgw/notifications/tasks/kafka/test_kafka.yaml diff --git a/qa/suites/rgw/notifications/tasks/others/+ b/qa/suites/rgw/notifications/tasks/others/+ new file mode 100644 index 0000000000000..e69de29bb2d1d 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 0000000000000..9e7852d4d25fa --- /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 0000000000000..46280a42a96d6 --- /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/test_others.yaml b/qa/suites/rgw/notifications/tasks/others/test_others.yaml similarity index 100% rename from qa/suites/rgw/notifications/tasks/test_others.yaml rename to qa/suites/rgw/notifications/tasks/others/test_others.yaml -- 2.39.5