From: Casey Bodley <cbodley@redhat.com>
Date: Sun, 22 Jan 2023 19:01:15 +0000 (-0500)
Subject: qa/s3tests: add tox task before every s3tests task
X-Git-Tag: v18.1.0~450^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=9d6513bd15639589035b9ed4848eb55b3eacd7a1;p=ceph.git

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 a001334cbbc60..caead6ea2dcb3 100644
--- 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 d6d1e5ee6ef87..42b2549224fc1 100644
--- 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 f53bdca494144..b749def2f9a74 100644
--- 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 9bae70cdbe579..a8675dcf1c8ef 100644
--- 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 302628759e904..7ff143243f1c6 100644
--- 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 e93a049fd5493..6a59dc905b6ed 100644
--- 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 573cffbc30a1d..44e7a90e3875d 100644
--- 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 4085984647156..da10a6f1ca1ef 100644
--- 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 a57399a5d66d8..f35771e78a3c3 100644
--- 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 189a2d57363b3..e3a1167c6ee85 100644
--- 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