Fix s3 tests in the rgw workunit.

Make it possible to set RGW_PORT with ENV variable.

Fixes: 7500
Signed-off-by: Warren Usui <warren.usui@inktank.com>

diff --git a/qa/workunits/rgw/s3_bucket_quota.pl b/qa/workunits/rgw/s3_bucket_quota.pl
index 091cbc9774760fc6754c17e78db1caacdb9552d7..ae6e273a17afcbbb99660ebe38bd38fe4b99f738 100755 (executable)
--- a/qa/workunits/rgw/s3_bucket_quota.pl
+++ b/qa/workunits/rgw/s3_bucket_quota.pl
@@ -53,7 +53,8 @@ my $kruft;
 my $s3;
 my $domain   = "front.sepia.ceph.com";
 my $host     = get_hostname();
-our $hostname = "$host.$domain:7280"; # as rgw is running on port 7280
+my $port     = $ENV{RGW_PORT}||7280;
+our $hostname = "$host.$domain:$port";
 our $testfileloc;
 my $rgw_user = "qa_user";
 

diff --git a/qa/workunits/rgw/s3_multipart_upload.pl b/qa/workunits/rgw/s3_multipart_upload.pl
index 449d212a1e72611902c0617eda61bf4f74319a2f..58be2aeae01d9eb27c50110fb4e45d5722d4c76a 100755 (executable)
--- a/qa/workunits/rgw/s3_multipart_upload.pl
+++ b/qa/workunits/rgw/s3_multipart_upload.pl
@@ -48,7 +48,8 @@ Pod::Usage::pod2usage(-verbose => 1) && exit if ($help);
 my $s3;
 my $domain   = "front.sepia.ceph.com";
 my $host     = get_hostname();
-our $hostname = "$host.$domain:7280";
+my $port     = $ENV{RGW_PORT}||7280;
+our $hostname = "$host.$domain:$port";
 our $testfileloc;
 our $mytestfilename;
 

diff --git a/qa/workunits/rgw/s3_user_quota.pl b/qa/workunits/rgw/s3_user_quota.pl
index 985d82f7fa2a58b0f0460126cdadb5dbaa5c9ee1..045d297a701b91fbfce000bfe14b9d009137827d 100755 (executable)
--- a/qa/workunits/rgw/s3_user_quota.pl
+++ b/qa/workunits/rgw/s3_user_quota.pl
@@ -52,7 +52,8 @@ my $kruft;
 my $s3;
 my $domain   = "front.sepia.ceph.com";
 my $host     = get_hostname();
-our $hostname = "$host.$domain:7280";
+my $port     = $ENV{RGW_PORT}||7280;
+our $hostname = "$host.$domain:$port";
 our $testfileloc;
 our $cnt;