From: Yuri Weinstein <yweinste@redhat.com>
Date: Wed, 2 Sep 2020 23:44:06 +0000 (-0700)
Subject: qa/tests: fixed subset for runs on master
X-Git-Tag: wip-pdonnell-testing-20200918.022351~168^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=b52cd76b9e70f45c434b184b7d25ffed5f728e48;p=ceph-ci.git

qa/tests: fixed subset for runs on master

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

diff --git a/qa/machine_types/schedule_subset.sh b/qa/machine_types/schedule_subset.sh
index 0b8ac1b7cfc..97f66d34b78 100755
--- a/qa/machine_types/schedule_subset.sh
+++ b/qa/machine_types/schedule_subset.sh
@@ -27,7 +27,7 @@
 echo "Scheduling " $2 " branch"
 if [ $2 = "master" ] ; then
         # run master branch with --newest option looking for good sha1 7 builds back with /9999 jobs
-        teuthology-suite -v -c $2 -m $3 -k $6 -s $4 --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/9999 --newest 7 -e $5 $7
+        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
 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
@@ -49,8 +49,6 @@ elif [ $2 = "nautilus" ] ; then
 elif [ $2 = "octopus" ] ; then
         teuthology-suite -v -c $2 -m $3 -k $6 -s $4 --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/9999 -e $5 $7
         # run nautilus branch with /100000 jobs fir rados == ~ 300 job
-elif [ $2 = "master" ] ; then
-        teuthology-suite -v -c $2 -m $3 -k $6 -s $4 --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/100000 -e $5 $7
 else
         # run NON master branches without --newest
         teuthology-suite -v -c $2 -m $3 -k $6 -s $4 --subset $(echo "(($(date +%U) % 4) * 7) + $1" | bc)/999 -e $5 $7