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 <dan.mick@redhat.com>

diff --git a/scripts/suite.py b/scripts/suite.py
index 48cc5e598046495912a2d58a905310df194161ea..d39a7aeb411249830e295c794a0e94b8a3c8372d 100644 (file)
--- a/scripts/suite.py
+++ b/scripts/suite.py
@@ -28,8 +28,8 @@ Standard arguments:
   -c <ceph>, --ceph <ceph>    The ceph branch to run against
                               [default: master]
   -k <kernel>, --kernel <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>, --flavor <flavor>
                               The kernel flavor to run against: ('basic',
                               'gcov', 'notcmalloc')

diff --git a/teuthology/suite.py b/teuthology/suite.py
index 53f11b4c115211f18eaf0b94fad7df32803e81c3..856ad6e084615cb79d697a6517c83a6e466a05fb 100644 (file)
--- 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,