From: Warren Usui <warren.usui@inktank.com>
Date: Mon, 28 Apr 2014 20:30:40 +0000 (-0700)
Subject: Fix s3 tests in the rgw workunit.
X-Git-Tag: v0.81~112^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1736%2Fhead;p=ceph.git

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 091cbc977476..ae6e273a17af 100755
--- 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 449d212a1e72..58be2aeae01d 100755
--- 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 985d82f7fa2a..045d297a701b 100755
--- 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;