From bd45f7a0590bf7e3a908deb73f876e30f42692c7 Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Fri, 12 Dec 2014 19:02:22 -0800 Subject: [PATCH] scripts/suite.py: remove default -k (kernel) value Note: will require current cron jobs to change to request -k testing explicitly. Removes current special meaning of '-k -'. Fixes: #10304 Signed-off-by: Dan Mick --- scripts/suite.py | 4 ++-- teuthology/suite.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/scripts/suite.py b/scripts/suite.py index 48cc5e5980..d39a7aeb41 100644 --- a/scripts/suite.py +++ b/scripts/suite.py @@ -28,8 +28,8 @@ Standard arguments: -c , --ceph The ceph branch to run against [default: master] -k , --kernel - The kernel branch to run against - [default: testing] + The kernel branch to run against; if not + supplied, the installed kernel is unchanged -f , --flavor The kernel flavor to run against: ('basic', 'gcov', 'notcmalloc') diff --git a/teuthology/suite.py b/teuthology/suite.py index 53f11b4c11..856ad6e084 100644 --- a/teuthology/suite.py +++ b/teuthology/suite.py @@ -120,7 +120,7 @@ def make_run_name(suite, ceph_branch, kernel_branch, kernel_flavor, worker = get_worker(machine_type) return '-'.join( [user, str(timestamp), suite, ceph_branch, - kernel_branch, kernel_flavor, worker] + kernel_branch or '-', kernel_flavor, worker] ) @@ -163,8 +163,8 @@ def create_initial_config(suite, suite_branch, 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 == '-': + # Skip the stanza if no -k given + elif kernel_branch is None: kernel_hash = None else: kernel_hash = get_hash('kernel', kernel_branch, kernel_flavor, -- 2.39.5