qa/rgw/multifs: factor common setup tasks into 0-install.yaml

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/qa/suites/rgw/multifs/0-install.yaml b/qa/suites/rgw/multifs/0-install.yaml
new file mode 100644 (file)
index 0000000..7e83140
--- /dev/null
+++ b/qa/suites/rgw/multifs/0-install.yaml
@@ -0,0 +1,5 @@
+tasks:
+- install:
+- ceph:
+- rgw: [client.0]
+- tox: [client.0]

diff --git a/qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml b/qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml
index 767debdf3c885643ae5ebc88af70eba478b68672..d9526c365c17d6e1e4d1efc60d2827d1b5e15c14 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml
@@ -1,7 +1,4 @@
 tasks:
-- install:
-- ceph:
-- rgw: [client.0]
 - workunit:
     clients:
       client.0:

diff --git a/qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml b/qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml
index 1781dee096ba479691d0f522b99f3c21d7d47aeb..ae32e9286615dffb3df3b49b68840e0f44ea2fc8 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml
@@ -1,7 +1,4 @@
 tasks:
-- install:
-- ceph:
-- rgw: [client.0]
 - workunit:
     clients:
       client.0:

diff --git a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
index 66bdff817f5aad90ee2ca71e8c0d17589a1e704b..184555660dc6a433263237372cca19c423ffcaa8 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
@@ -1,8 +1,4 @@
 tasks:
-- install:
-- ceph:
-- rgw: [client.0]
-- tox: [client.0]
 - ragweed:
     client.0:
       default-branch: ceph-master

diff --git a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
index 92355f049632649c268c8507190e73491363cc7f..573cffbc30a1d123042c47a3e92bd951b41ee37f 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
@@ -1,8 +1,4 @@
 tasks:
-- install:
-- ceph:
-- rgw: [client.0]
-- tox: [client.0]
 - s3tests:
     client.0:
       rgw_server: client.0

diff --git a/qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml b/qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml
index c2c38a816cc8c280a7ec5d8ed771b62173420868..393180e5c1729cfa9b7b091a5370d6657eecfb76 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml
@@ -1,7 +1,4 @@
 tasks:
-- install:
-- ceph:
-- rgw: [client.0]
 - workunit:
     clients:
       client.0: