suite: add flavor in base build_config

build flavor remains common for all jobs and is something that is
good to look into while our jobs are being scheduled

This will be useful when changing from default flavor
to ones in available (crimson/jaeger) by using --flavor arg

teuthology/suite/test: update unit tests to test build flavor

Signed-off-by: Deepika Upadhyay <dupadhya@redhat.com>

diff --git a/teuthology/suite/placeholder.py b/teuthology/suite/placeholder.py
index 4138541723b6aa848af244e4e4b8914fe12a98e2..30f9283e5a2004beef6e2f867ec28ce3add4df73 100644 (file)
--- a/teuthology/suite/placeholder.py
+++ b/teuthology/suite/placeholder.py
@@ -72,6 +72,7 @@ dict_templ = {
                     'debug osd': 20
                 }
             },
+            'flavor': Placeholder('flavor'),
             'log-whitelist': ['\(MDS_ALL_DOWN\)',
                               '\(MDS_UP_LESS_THAN_MAX\)'],
             'log-ignorelist': ['\(MDS_ALL_DOWN\)',
@@ -91,6 +92,7 @@ dict_templ = {
         'install': {
             'ceph': {
                 'sha1': Placeholder('ceph_hash'),
+                'flavor': Placeholder('flavor'),
             }
         },
         'workunit': {

diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py
index fda03bb7b494558a2f259430617d510a6fdb2631..6f51b98d7452296996c800f1eb2f3b37bb51aca3 100644 (file)
--- a/teuthology/suite/run.py
+++ b/teuthology/suite/run.py
@@ -121,6 +121,7 @@ class Run(object):
             archive_upload_key=config.archive_upload_key,
             suite_repo=config.get_ceph_qa_suite_git_url(),
             suite_relpath=self.args.suite_relpath,
+            flavor=self.args.flavor,
         )
         return self.build_base_config()
 

diff --git a/teuthology/suite/test/test_placeholder.py b/teuthology/suite/test/test_placeholder.py
index 3427439fd309de0dabff6ebe1d00d7f835bf2c45..acf1b6a44fd86e2b9a36c4996da4613242d215d3 100644 (file)
--- a/teuthology/suite/test/test_placeholder.py
+++ b/teuthology/suite/test/test_placeholder.py
@@ -22,6 +22,7 @@ class TestPlaceholder(object):
             suite_repo='https://example.com/ceph/suite.git',
             suite_relpath='',
             ceph_repo='https://example.com/ceph/ceph.git',
+            flavor='default'
         )
         output_dict = substitute_placeholders(dict_templ, input_dict)
         assert output_dict['suite'] == 'suite'
@@ -48,6 +49,7 @@ class TestPlaceholder(object):
             suite_repo='https://example.com/ceph/suite.git',
             suite_relpath='',
             ceph_repo='https://example.com/ceph/ceph.git',
+            flavor=None,
         )
         output_dict = substitute_placeholders(dict_templ, input_dict)
         assert 'os_type' not in output_dict