tests: deepsea: move RGW SSL test case into basic/rgw

. . . and drop basic/rgw-ssl

Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/qa/suites/deepsea/basic/rgw-ssl/% b/qa/suites/deepsea/basic/rgw-ssl/%
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/qa/suites/deepsea/basic/rgw-ssl/cluster/1node3disks.yaml b/qa/suites/deepsea/basic/rgw-ssl/cluster/1node3disks.yaml
deleted file mode 120000 (symlink)
index 86751e2..0000000
--- a/qa/suites/deepsea/basic/rgw-ssl/cluster/1node3disks.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../deepsea/1node3disks.yaml
\ No newline at end of file

diff --git a/qa/suites/deepsea/basic/rgw-ssl/distros/sle_12.3.yaml b/qa/suites/deepsea/basic/rgw-ssl/distros/sle_12.3.yaml
deleted file mode 120000 (symlink)
index db5414b..0000000
--- a/qa/suites/deepsea/basic/rgw-ssl/distros/sle_12.3.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../deepsea/sle_12.3.yaml
\ No newline at end of file

diff --git a/qa/suites/deepsea/basic/rgw-ssl/exec/health-rgw-ssl-cli.yaml b/qa/suites/deepsea/basic/rgw-ssl/exec/health-rgw-ssl-cli.yaml
deleted file mode 100644 (file)
index 9028323..0000000
--- a/qa/suites/deepsea/basic/rgw-ssl/exec/health-rgw-ssl-cli.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-overrides:
-  deepsea:
-    exec:
-    - suites/basic/health-rgw-ssl.sh --cli

diff --git a/qa/suites/deepsea/basic/rgw-ssl/exec/health-rgw-ssl.yaml b/qa/suites/deepsea/basic/rgw-ssl/exec/health-rgw-ssl.yaml
deleted file mode 100644 (file)
index 7166fe5..0000000
--- a/qa/suites/deepsea/basic/rgw-ssl/exec/health-rgw-ssl.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-overrides:
-  deepsea:
-    exec:
-    - suites/basic/health-rgw-ssl.sh

diff --git a/qa/suites/deepsea/basic/rgw-ssl/tasks.yaml b/qa/suites/deepsea/basic/rgw-ssl/tasks.yaml
deleted file mode 120000 (symlink)
index 8d22ef5..0000000
--- a/qa/suites/deepsea/basic/rgw-ssl/tasks.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../../../deepsea/tasks.yaml
\ No newline at end of file

diff --git a/qa/suites/deepsea/basic/rgw/exec/health-rgw-cli-ssl.yaml b/qa/suites/deepsea/basic/rgw/exec/health-rgw-cli-ssl.yaml
new file mode 100644 (file)
index 0000000..8d760b2
--- /dev/null
+++ b/qa/suites/deepsea/basic/rgw/exec/health-rgw-cli-ssl.yaml
@@ -0,0 +1,4 @@
+overrides:
+  deepsea:
+    exec:
+    - suites/basic/health-rgw.sh --cli --ssl

diff --git a/qa/suites/deepsea/basic/rgw/exec/health-rgw-ssl.yaml b/qa/suites/deepsea/basic/rgw/exec/health-rgw-ssl.yaml
new file mode 100644 (file)
index 0000000..1257d06
--- /dev/null
+++ b/qa/suites/deepsea/basic/rgw/exec/health-rgw-ssl.yaml
@@ -0,0 +1,4 @@
+overrides:
+  deepsea:
+    exec:
+    - suites/basic/health-rgw.sh --ssl