qa/s3tests: add tox task before every s3tests task

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

diff --git a/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml b/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml
index a001334cbbc604ddf8658381453f207504e08535..caead6ea2dcb3fd107eb12a62c5ca7eeae369d78 100644 (file)
--- a/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml
+++ b/qa/suites/rgw/cloud-transition/tasks/cloud_transition_s3tests.yaml
@@ -45,6 +45,7 @@ tasks:
         # cloud-user creds to be created on cloud-client
         #cloud_secret: "foobar"
         #cloud_access_key: "87654321"
+- tox: [client.0]
 - s3tests:
     client.0:
       rgw_server: client.0

diff --git a/qa/suites/rgw/crypt/4-tests/s3tests.yaml b/qa/suites/rgw/crypt/4-tests/s3tests.yaml
index d6d1e5ee6ef873f81b34b4bc62836b189b41a866..42b2549224fc17bbbbf6b0ddd1bbd0696b659fee 100644 (file)
--- a/qa/suites/rgw/crypt/4-tests/s3tests.yaml
+++ b/qa/suites/rgw/crypt/4-tests/s3tests.yaml
@@ -1,4 +1,5 @@
 tasks:
+- tox: [client.0]
 - s3tests:
     client.0:
       barbican:

diff --git a/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml b/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml
index f53bdca4941444ac12cf9def19e60b69d360ce13..b749def2f9a741a4f653d33ccd59410d67337174 100644 (file)
--- a/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/dbstore/tasks/rgw_s3tests.yaml
@@ -2,6 +2,7 @@ tasks:
 - install:
 - ceph:
 - rgw: [client.0]
+- tox: [client.0]
 - exec:
     client.0:
       - sudo chmod 0777 /var/lib/ceph

diff --git a/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml b/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml
index 9bae70cdbe579a3355063415f8a4b2282b8ef460..a8675dcf1c8efa12c41e5f00c1271b534c79e038 100644 (file)
--- a/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/lifecycle/tasks/rgw_s3tests.yaml
@@ -2,6 +2,7 @@ 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_s3tests.yaml b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
index 302628759e90492af1043279d274a98aafbbb447..7ff143243f1c67c40868008f6792dab5896630d1 100644 (file)
--- a/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
+++ b/qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
@@ -2,6 +2,7 @@ tasks:
 - install:
 - ceph:
 - rgw: [client.0]
+- tox: [client.0]
 - s3tests:
     client.0:
       rgw_server: client.0

diff --git a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
index e93a049fd5493cbf94ec3a1b5a9dd36d06007e8f..6a59dc905b6edbe2146672e4e9b60f76e7c5950d 100644 (file)
--- a/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
+++ b/qa/suites/rgw/thrash/workload/rgw_s3tests.yaml
@@ -1,4 +1,5 @@
 tasks:
+- tox: [client.0]
 - s3tests:
     client.0:
       rgw_server: client.0

diff --git a/qa/suites/rgw/verify/tasks/s3tests.yaml b/qa/suites/rgw/verify/tasks/s3tests.yaml
index 573cffbc30a1d123042c47a3e92bd951b41ee37f..44e7a90e3875dba0b24cf637ae4308df8032025c 100644 (file)
--- a/qa/suites/rgw/verify/tasks/s3tests.yaml
+++ b/qa/suites/rgw/verify/tasks/s3tests.yaml
@@ -1,4 +1,5 @@
 tasks:
+- tox: [client.0]
 - s3tests:
     client.0:
       rgw_server: client.0

diff --git a/qa/suites/rgw/website/tasks/s3tests-website.yaml b/qa/suites/rgw/website/tasks/s3tests-website.yaml
index 4085984647156e051afccfc52e9ac667621d7022..da10a6f1ca1efce70b5fd0405539b22cc61f8903 100644 (file)
--- a/qa/suites/rgw/website/tasks/s3tests-website.yaml
+++ b/qa/suites/rgw/website/tasks/s3tests-website.yaml
@@ -10,6 +10,7 @@ tasks:
       dns-name: s3.
     client.1:
       dns-s3website-name: s3-website.
+- tox: [client.0]
 - s3tests:
     client.0:
       rgw_server: client.0

diff --git a/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml b/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml
index a57399a5d66d80d275a4dde784b0aa05b74ff26e..f35771e78a3c31633f33a1bea28b48e565fe47db 100644 (file)
--- a/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml
+++ b/qa/suites/smoke/basic/tasks/test/rgw_ec_s3tests.yaml
@@ -5,6 +5,7 @@ overrides:
 tasks:
 - ceph:
 - rgw: [client.0]
+- tox: [client.0]
 - s3tests:
     client.0:
       force-branch: ceph-master

diff --git a/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml b/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml
index 189a2d57363b3cd2ed45e8e141f758094c9cd954..e3a1167c6ee85de8a363914105f56f378c11f43d 100644 (file)
--- a/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml
+++ b/qa/suites/smoke/basic/tasks/test/rgw_s3tests.yaml
@@ -2,6 +2,7 @@ tasks:
 - ceph:
     fs: xfs
 - rgw: [client.0]
+- tox: [client.0]
 - s3tests:
     client.0:
       force-branch: ceph-master