Merge pull request ceph#59745 from cbodley/wip-qa-rgw-multifs-combined

qa/rgw/multifs: add tasks/+ to concatenate tasks into same job

Reviewed-by: Adam Emerson <[email protected]>

Author: cbodley

qa/suites/rgw/multifs/0-install.yaml

@@ -0,0 +1,5 @@
+tasks:
+- install:
+- ceph:
+- rgw: [client.0]
+- tox: [client.0]

qa/suites/rgw/multifs/tasks/+

@@ -1,13 +1,5 @@
 tasks:
-- install:
-- ceph:
-- rgw: [client.0]
 - workunit:
     clients:
       client.0:
         - rgw/s3_bucket_quota.pl
-overrides:
-  ceph:
-    conf:
-      client:
-        rgw relaxed s3 bucket names: true

qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml

@@ -1,13 +1,5 @@
 tasks:
-- install:
-- ceph:
-- rgw: [client.0]
 - workunit:
     clients:
       client.0:
         - rgw/s3_multipart_upload.pl
-overrides:
-  ceph:
-    conf:
-      client:
-        rgw relaxed s3 bucket names: true

qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml

@@ -1,8 +1,4 @@
 tasks:
-- install:
-- ceph:
-- rgw: [client.0]
-- tox: [client.0]
 - ragweed:
     client.0:
       default-branch: ceph-master

qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml

@@ -1,8 +1,4 @@
 tasks:
-- install:
-- ceph:
-- rgw: [client.0]
-- tox: [client.0]
 - s3tests:
     client.0:
       rgw_server: client.0

qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml

@@ -1,13 +1,5 @@
 tasks:
-- install:
-- ceph:
-- rgw: [client.0]
 - workunit:
     clients:
       client.0:
         - rgw/s3_user_quota.pl
-overrides:
-  ceph:
-    conf:
-      client:
-        rgw relaxed s3 bucket names: true

qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml

@@ -21,7 +21,7 @@ sub get_timestamp {
    if ($min < 10) { $min = "0$min"; }
    if ($sec < 10) { $sec = "0$sec"; }
    $year=$year+1900;
-   return $year . '_' . $mon . '_' . $mday . '_' . $hour . '_' . $min . '_' . $sec;
+   return $year . '-' . $mon . '-' . $mday . '-' . $hour . '-' . $min . '-' . $sec;
 }
 
 # Function to check if radosgw is already running
@@ -195,11 +195,12 @@ sub run_s3
                 host                  => $hostname,
                 secure                => 0,
                 retry                 => 1,
+                dns_bucket_names      => 0,
             }
       );
     }
 
-our $bucketname = 'buck_'.get_timestamp();
+our $bucketname = 'buck-'.get_timestamp();
 # create a new bucket (the test bucket)
 our $bucket = $s3->add_bucket( { bucket => $bucketname } )
       or die $s3->err. "bucket $bucketname create failed\n". $s3->errstr;