From 9dc5bf95035dca62ada780924f5658aa87394cee Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Sun, 10 Sep 2017 09:39:45 +0200 Subject: [PATCH] tests: deepsea: move RGW SSL test case into basic/rgw . . . and drop basic/rgw-ssl Signed-off-by: Nathan Cutler --- qa/suites/deepsea/basic/rgw-ssl/% | 0 qa/suites/deepsea/basic/rgw-ssl/cluster/1node3disks.yaml | 1 - qa/suites/deepsea/basic/rgw-ssl/distros/sle_12.3.yaml | 1 - qa/suites/deepsea/basic/rgw-ssl/exec/health-rgw-ssl-cli.yaml | 4 ---- qa/suites/deepsea/basic/rgw-ssl/exec/health-rgw-ssl.yaml | 4 ---- qa/suites/deepsea/basic/rgw-ssl/tasks.yaml | 1 - qa/suites/deepsea/basic/rgw/exec/health-rgw-cli-ssl.yaml | 4 ++++ qa/suites/deepsea/basic/rgw/exec/health-rgw-ssl.yaml | 4 ++++ 8 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 qa/suites/deepsea/basic/rgw-ssl/% delete mode 120000 qa/suites/deepsea/basic/rgw-ssl/cluster/1node3disks.yaml delete mode 120000 qa/suites/deepsea/basic/rgw-ssl/distros/sle_12.3.yaml delete mode 100644 qa/suites/deepsea/basic/rgw-ssl/exec/health-rgw-ssl-cli.yaml delete mode 100644 qa/suites/deepsea/basic/rgw-ssl/exec/health-rgw-ssl.yaml delete mode 120000 qa/suites/deepsea/basic/rgw-ssl/tasks.yaml create mode 100644 qa/suites/deepsea/basic/rgw/exec/health-rgw-cli-ssl.yaml create mode 100644 qa/suites/deepsea/basic/rgw/exec/health-rgw-ssl.yaml diff --git a/qa/suites/deepsea/basic/rgw-ssl/% b/qa/suites/deepsea/basic/rgw-ssl/% deleted file mode 100644 index e69de29bb2d1d..0000000000000 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 index 86751e29b53bb..0000000000000 --- 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 index db5414bae9dfb..0000000000000 --- 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 index 9028323d4d881..0000000000000 --- 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 index 7166fe553ea26..0000000000000 --- 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 index 8d22ef55fdcc9..0000000000000 --- 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 index 0000000000000..8d760b203c810 --- /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 index 0000000000000..1257d06996030 --- /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 -- 2.39.5