Import ceph 15.2.8

[ceph.git] / ceph / qa / machine_types / schedule_subset.sh

diff --git a/ceph/qa/machine_types/schedule_subset.sh b/ceph/qa/machine_types/schedule_subset.sh
index d8fdbb86dbcea206add00f0817fc309821f5610c..8078205d6047ac380a74f5b75b7c914be9b43c61 100755 (executable)
--- a/ceph/qa/machine_types/schedule_subset.sh
+++ b/ceph/qa/machine_types/schedule_subset.sh
@@ -26,11 +26,9 @@
 
 echo "Scheduling " $2 " branch"
 if [ $2 = "master" ] ; then
-        # run master branch with --newest option looking for good sha1 7 builds back with /999 jobs
-        teuthology-suite -v -c $2 -m $3 -k $6 -s $4 --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/999 --newest 7 -e $5 $7
-elif [ $2 = "hammer" ] ; then
-        # run hammer branch with less jobs
-        teuthology-suite -v -c $2 -m $3 -k $6 -s $4 --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/56 -e $5 $7
+        # run master branch with --newest option looking for good sha1 7 builds back with /100000 jobs
+        # using '-p 80 --force-priority' as an execption ATM
+        teuthology-suite -v -c $2 -m $3 -k $6 -s $4 --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/100000 --newest 7 -e $5 $7 -p 80 --force-priority
 elif [ $2 = "jewel" ] ; then
         # run jewel branch with /40 jobs
         teuthology-suite -v -c $2 -m $3 -k $6 -s $4 --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/40 -e $5 $7