From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 10 Jul 2019 15:39:45 +0000 (-0400)
Subject: qa/rgw: run-s3tests.sh runs in s3tests directory
X-Git-Tag: v15.1.0~2207^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28964%2Fhead;p=ceph.git

qa/rgw: run-s3tests.sh runs in s3tests directory

something looks for request_decision_graph.yml in the working directory

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/workunits/rgw/run-s3tests.sh b/qa/workunits/rgw/run-s3tests.sh
index 0d7b9731c4f6..307eea01b56a 100755
--- a/qa/workunits/rgw/run-s3tests.sh
+++ b/qa/workunits/rgw/run-s3tests.sh
@@ -29,10 +29,10 @@ git clone https://github.com/ceph/s3-tests
 cd s3-tests
 git checkout ceph-$branch
 VIRTUALENV_PYTHON=/usr/bin/python2 ./bootstrap
-cd ../..
 
-S3TEST_CONF=$dir/s3-tests/s3tests.conf.SAMPLE $dir/s3-tests/virtualenv/bin/nosetests -a '!fails_on_rgw,!lifecycle_expiration,!fails_strict_rfc2616' -v
+S3TEST_CONF=s3tests.conf.SAMPLE virtualenv/bin/nosetests -a '!fails_on_rgw,!lifecycle_expiration,!fails_strict_rfc2616' -v
 
+cd ../..
 rm -rf $dir
 
 echo OK.