Default suite_relpath to 'qa'

To reflect the move from ceph-qa-suite.git -> ceph.git

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/scripts/suite.py b/scripts/suite.py
index 205ae36574fcb7e3fe7a85b5449bb0e96ef14172..c62a0e0d5ed6843c2c72f3a745bdc0399653ac0f 100644 (file)
--- a/scripts/suite.py
+++ b/scripts/suite.py
@@ -64,6 +64,7 @@ Standard arguments:
   --suite-relpath <suite_relpath>
                               Look for tasks and suite definitions in this
                               subdirectory of the suite repo.
+                              [default: qa]
   --suite-branch <suite_branch>
                               Use this suite branch instead of the ceph branch
   --suite-dir <suite_dir>     Use this alternative directory as-is when

diff --git a/teuthology/suite/test/test_init.py b/teuthology/suite/test/test_init.py
index 16b07a888d5480581d18067302f651d073395c98..78a6f21300d19956d3906ddf7d63bb327cf68d59 100644 (file)
--- a/teuthology/suite/test/test_init.py
+++ b/teuthology/suite/test/test_init.py
@@ -155,6 +155,7 @@ class TestSuiteMain(object):
             config.suite_verify_ceph_hash = False
             main(['--suite', suite_name,
                   '--suite-dir', suite_dir,
+                  '--suite-relpath', '',
                   '--throttle', throttle,
                   '--machine-type', machine_type])
             m_sleep.assert_called_with(int(throttle))
@@ -179,6 +180,7 @@ class TestSuiteMain(object):
             config.suite_verify_ceph_hash = True
             main(['--suite', suite_name,
                   '--suite-dir', suite_dir,
+                  '--suite-relpath', '',
                   '--throttle', throttle,
                   '--machine-type', machine_type])
             m_sleep.assert_called_with(int(throttle))