From ab0bf27b44979317781e7b855dd144dd791c2ee0 Mon Sep 17 00:00:00 2001
From: Zack Cerza <zack@redhat.com>
Date: Wed, 25 Jan 2017 15:20:43 -0700
Subject: [PATCH] teuthology-suite: Drop default for --ceph

Signed-off-by: Zack Cerza <zack@redhat.com>
---
 scripts/suite.py                   |  5 ++---
 teuthology/suite/test/test_init.py | 27 +++++++++++++++++----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/scripts/suite.py b/scripts/suite.py
index c62a0e0d5e..c832055941 100644
--- a/scripts/suite.py
+++ b/scripts/suite.py
@@ -6,8 +6,8 @@ from teuthology.config import config
 
 doc = """
 usage: teuthology-suite --help
-       teuthology-suite [-v | -vv ] --suite <suite> [options] [<config_yaml>...]
-       teuthology-suite [-v | -vv ] --rerun <name>  [options] [<config_yaml>...]
+       teuthology-suite [-v | -vv ] --ceph <ceph> --suite <suite> [options] [<config_yaml>...]
+       teuthology-suite [-v | -vv ] --ceph <ceph> --rerun <name>  [options] [<config_yaml>...]
 
 Run a suite of ceph integration tests. A suite is a directory containing
 facets. A facet is a directory containing config snippets. Running a suite
@@ -31,7 +31,6 @@ Standard arguments:
                               The suite to schedule
   --wait                      Block until the suite is finished
   -c <ceph>, --ceph <ceph>    The ceph branch to run against
-                              [default: master]
   -S <sha1>, --sha1 <sha1>    The ceph sha1 to run against (overrides -c)
                               If both -S and -c are supplied, -S wins, and
                               there is no validation that sha1 is contained
diff --git a/teuthology/suite/test/test_init.py b/teuthology/suite/test/test_init.py
index 78a6f21300..5f13b6ec7c 100644
--- a/teuthology/suite/test/test_init.py
+++ b/teuthology/suite/test/test_init.py
@@ -131,6 +131,7 @@ class TestSuiteMain(object):
                 prepare_and_schedule=prepare_and_schedule,
             ):
                 main([
+                    '--ceph', 'master',
                     '--suite', suite_name,
                     '--throttle', throttle,
                     '--machine-type', machine_type,
@@ -153,11 +154,14 @@ class TestSuiteMain(object):
         ) as m:
             m['package_version_for_hash'].return_value = 'fake-9.5'
             config.suite_verify_ceph_hash = False
-            main(['--suite', suite_name,
-                  '--suite-dir', suite_dir,
-                  '--suite-relpath', '',
-                  '--throttle', throttle,
-                  '--machine-type', machine_type])
+            main([
+                '--ceph', 'master',
+                '--suite', suite_name,
+                '--suite-dir', suite_dir,
+                '--suite-relpath', '',
+                '--throttle', throttle,
+                '--machine-type', machine_type
+            ])
             m_sleep.assert_called_with(int(throttle))
             m['get_gitbuilder_hash'].assert_not_called()
 
@@ -178,9 +182,12 @@ class TestSuiteMain(object):
         ) as m:
             m['package_version_for_hash'].return_value = 'fake-9.5'
             config.suite_verify_ceph_hash = True
-            main(['--suite', suite_name,
-                  '--suite-dir', suite_dir,
-                  '--suite-relpath', '',
-                  '--throttle', throttle,
-                  '--machine-type', machine_type])
+            main([
+                '--ceph', 'master',
+                '--suite', suite_name,
+                '--suite-dir', suite_dir,
+                '--suite-relpath', '',
+                '--throttle', throttle,
+                '--machine-type', machine_type
+            ])
             m_sleep.assert_called_with(int(throttle))
-- 
2.39.5