From: Yuri Weinstein <yweinste@redhat.com>
Date: Fri, 15 Jul 2016 16:39:53 +0000 (-0700)
Subject: Added option to search for newest good/built commit (7 commits back)
X-Git-Tag: v11.1.1~58^2^2~147^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c1313455f188ac06a3ba8e7ab7c8f66fe73a8ef;p=ceph.git

Added option to search for newest good/built commit (7 commits back)

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
---

diff --git a/machine_types/schedule_rados.sh b/machine_types/schedule_rados.sh
index 3aef851f2ed..9f3d691e792 100755
--- a/machine_types/schedule_rados.sh
+++ b/machine_types/schedule_rados.sh
@@ -20,4 +20,11 @@
 ## $1 day of the week (0-6)
 ## /28 for 4 weeks
 
-teuthology-suite -v -c $2 -m $3 -k distro -s rados --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/28 -e $4 $5
+echo "Scheduling " $2 " branch"
+if [ $2 = "master" ] ; then
+        # run master branch with --newest option looking for good sha1 7 builds back
+        teuthology-suite -v -c $2 -m $3 -k distro -s rados --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/28 --newest 7 -e $4 $5
+else
+        # run NON master branches without --newest 
+        teuthology-suite -v -c $2 -m $3 -k distro -s rados --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/28 -e $4 $5
+fi
diff --git a/machine_types/schedule_rados_ovh.sh b/machine_types/schedule_rados_ovh.sh
index cc9e178b46f..2685b976aca 100755
--- a/machine_types/schedule_rados_ovh.sh
+++ b/machine_types/schedule_rados_ovh.sh
@@ -20,4 +20,12 @@
 ## $1 day of the week (0-6)
 ## /28 for 4 weeks
 
-teuthology-suite -v -c $2 -m $3 -k distro -s rados --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/28 -e $4 ~/vps.yaml $5
+echo "Scheduling " $2 " branch"
+if [ $2 = "master" ] ; then
+        # run master branch with --newest option looking for good sha1 7 builds back
+        teuthology-suite -v -c $2 -m $3 -k distro -s rados --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/28 --newest 7 -e $4 ~/vps.yaml $5
+else
+        # run NON master branches without --newest 
+        teuthology-suite -v -c $2 -m $3 -k distro -s rados --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/28 -e $4 ~/vps.yaml $5
+fi
+