RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-17 21:05:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Reviewed-by: Adam Emerson <aemerson@redhat.com>
This commit is contained in:
Casey Bodley 2024-10-01 16:46:15 -04:00 committed by GitHub
commit fe273a981a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
qa/suites/rgw/multifs/0-install.yaml Normal file
View File

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

0
qa/suites/rgw/multifs/tasks/+ Normal file
View File

8
qa/suites/rgw/multifs/tasks/rgw_bucket_quota.yaml
View File

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

8
qa/suites/rgw/multifs/tasks/rgw_multipart_upload.yaml
View File

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

4
qa/suites/rgw/multifs/tasks/rgw_ragweed.yaml
View File

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

4
qa/suites/rgw/multifs/tasks/rgw_s3tests.yaml
View File

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

8
qa/suites/rgw/multifs/tasks/rgw_user_quota.yaml
View File

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

5
qa/workunits/rgw/s3_utilities.pm
View File

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