From: Zack Cerza Date: Wed, 25 Jun 2014 16:02:59 +0000 (-0600) Subject: Skip the kernel stanza if the branch passed is '-' X-Git-Tag: 1.1.0~1371 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f4321b0519001ebeffff925647300b40ecb22d8b;p=teuthology.git Skip the kernel stanza if the branch passed is '-' Signed-off-by: Zack Cerza --- diff --git a/teuthology/suite.py b/teuthology/suite.py index 8466c89865..2227d7e40a 100644 --- a/teuthology/suite.py +++ b/teuthology/suite.py @@ -112,6 +112,9 @@ def create_initial_config(nice_suite, ceph_branch, teuthology_branch, # Put together a stanza specifying the kernel hash if kernel_branch == 'distro': kernel_hash = 'distro' + # Skip the stanza if the branch passed is '-' + elif kernel_branch == '-': + kernel_hash = None else: kernel_hash = get_hash('kernel', kernel_branch, kernel_flavor, machine_type) @@ -121,6 +124,9 @@ def create_initial_config(nice_suite, ceph_branch, teuthology_branch, if kernel_hash: log.info("kernel sha1: {hash}".format(hash=kernel_hash)) kernel_dict = dict(kernel=dict(kdb=True, sha1=kernel_hash)) + kernel_stanza = yaml.dump(kernel_dict, default_flow_style=False).strip() + else: + kernel_stanza = '' # Get the ceph hash ceph_hash = get_hash('ceph', ceph_branch, kernel_flavor, machine_type) @@ -162,7 +168,7 @@ def create_initial_config(nice_suite, ceph_branch, teuthology_branch, ceph_hash=ceph_hash, teuthology_branch=teuthology_branch, machine_type=machine_type, - kernel_stanza=yaml.dump(kernel_dict, default_flow_style=False).strip(), + kernel_stanza=kernel_stanza, distro=distro, s3_branch=s3_branch, )