From: Sandon Van Ness <sandon@inktank.com>
Date: Tue, 23 Jul 2013 23:09:07 +0000 (-0700)
Subject: Add distro type to schedule_suite.sh
X-Git-Tag: 1.1.0~2042^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=71b66ebd9990e4ec2afb746e29432c24c226395f;p=teuthology.git

Add distro type to schedule_suite.sh

Also added machinetype to the name.

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

diff --git a/schedule_suite.sh b/schedule_suite.sh
index 031c92f15..1464c5211 100755
--- a/schedule_suite.sh
+++ b/schedule_suite.sh
@@ -8,15 +8,18 @@ flavor=$5
 teuthology_branch=$6
 mtype=$7
 template=$8
+distro=$9
 
 if [ -z "$email" ]; then
-    echo "usage: $0 <suite> <ceph branch> <kernel branch> <email> [flavor] [teuthology-branch] [machinetype] [template]"
+    echo "usage: $0 <suite> <ceph branch> <kernel branch> <email> [flavor] [teuthology-branch] [machinetype] [template] [distro]"
     echo "  flavor can be 'basic', 'gcov', 'notcmalloc'."
     exit 1
 fi
 
 [ -z "$flavor" ] && flavor='basic'
 
+[ -z "$distro" ] && distro='ubuntu'
+
 
 ##
 test ! -d ~/src/ceph-qa-suite && echo "error: expects to find ~/src/ceph-qa-suite" && exit 1
@@ -61,6 +64,7 @@ kernel:
   sha1: $KERNEL_SHA1
 nuke-on-error: true
 machine_type: $mtype
+os_type: $distro
 tasks:
 - chef:
 - clock.check:
@@ -98,7 +102,7 @@ fi
 
 ##
 stamp=`date +%Y-%m-%d_%H:%M:%S`
-name=`whoami`"-$stamp-$suite-$ceph-$kernel-$flavor"
+name=`whoami`"-$stamp-$suite-$ceph-$kernel-$flavor-$mtype"
 
 echo "name $name"