From: Sandon Van Ness <sandon@inktank.com>
Date: Sat, 17 Aug 2013 00:08:04 +0000 (-0700)
Subject: Kernel value of - uses doesn't install kernel.
X-Git-Tag: 1.1.0~1966
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7df9cf520e36f0316c7bdf0d0341d780d4423a61;p=teuthology.git

Kernel value of - uses doesn't install kernel.

Using - as the kernel value (instead of what is usually 'testing'
will not add the kernel install tasks tot he yaml so the machine
will run the tests on its current running kernel (usefull for arm
and others).

Issue #6023.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
---

diff --git a/schedule_suite.sh b/schedule_suite.sh
index c21f3aa7e2..ca620556c6 100755
--- a/schedule_suite.sh
+++ b/schedule_suite.sh
@@ -20,16 +20,23 @@ fi
 
 [ -z "$distro" ] && distro='ubuntu'
 
-
+if [ "$kernel" = "-" ]
+then
+    kernelvalue=""
+else
+    KERNEL_SHA1=`wget http://gitbuilder.ceph.com/kernel-deb-precise-x86_64-basic/ref/$kernel/sha1 -O- 2>/dev/null`
+    [ -z "$KERNEL_SHA1" ] && echo "kernel branch $kernel dne" && exit 1
+    kernelvalue="kernel:
+  kdb: true
+  sha1: $KERNEL_SHA1"
+fi
 ##
 test ! -d ~/src/ceph-qa-suite && echo "error: expects to find ~/src/ceph-qa-suite" && exit 1
 test ! -d ~/src/teuthology/virtualenv/bin && echo "error: expects to find ~/src/teuthology/virtualenv/bin" && exit 1
 
 ## get sha1
-KERNEL_SHA1=`wget http://gitbuilder.ceph.com/kernel-deb-precise-x86_64-basic/ref/$kernel/sha1 -O- 2>/dev/null`
 CEPH_SHA1=`wget http://gitbuilder.ceph.com/ceph-deb-precise-x86_64-$flavor/ref/$ceph/sha1 -O- 2>/dev/null`
 
-[ -z "$KERNEL_SHA1" ] && echo "kernel branch $kernel dne" && exit 1
 [ -z "$CEPH_SHA1" ] && echo "ceph branch $ceph dne" && exit 1
 
 
@@ -60,9 +67,7 @@ fn="/tmp/schedule.suite.$$"
 trap "rm $fn" EXIT
 cat <<EOF > $fn
 teuthology_branch: $teuthology_branch
-kernel:
-  kdb: true
-  sha1: $KERNEL_SHA1
+$kernelvalue
 nuke-on-error: true
 machine_type: $mtype
 os_type: $distro