summaryrefslogtreecommitdiff
path: root/buildscripts
diff options
context:
space:
mode:
authorMike Grundy <michael.grundy@10gen.com>2016-10-12 11:17:47 -0400
committerMike Grundy <michael.grundy@10gen.com>2016-10-12 13:17:25 -0400
commita96726123cb8f862fb81224f02d2d982dd807121 (patch)
treeb0720076f89dbea4f4f76892650a478b881e3e4b /buildscripts
parent350c0382b170c8cc97caddd586110fbd509543f1 (diff)
downloadmongo-a96726123cb8f862fb81224f02d2d982dd807121.tar.gz
SERVER-25640 burn_in_tests.py should skip current rev when checking for last scheduled
Diffstat (limited to 'buildscripts')
-rw-r--r--buildscripts/burn_in_tests.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/buildscripts/burn_in_tests.py b/buildscripts/burn_in_tests.py
index ad0c13a4a97..5c9074032be 100644
--- a/buildscripts/burn_in_tests.py
+++ b/buildscripts/burn_in_tests.py
@@ -194,8 +194,12 @@ def find_changed_tests(branch_name, base_commit, max_revisions, buildvariant, ch
if base_commit is None:
base_commit = callo(["git", "merge-base", branch_name + "@{upstream}", "HEAD"]).rstrip()
if check_evergreen:
- # We're going to check up to 200 commits in evergreen for the last scheduled one
- revs_to_check = callo(["git", "rev-list", base_commit, "--max-count=200"]).splitlines()
+ # We're going to check up to 200 commits in Evergreen for the last scheduled one.
+ # The current commit will be activated in Evergreen; we use --skip to start at the
+ # previous commit when trying to find the most recent preceding commit that has been
+ # activated.
+ revs_to_check = callo(["git", "rev-list", base_commit,
+ "--max-count=200", "--skip=1"]).splitlines()
last_activated = find_last_activated_task(revs_to_check, buildvariant, branch_name)
print "Comparing current branch against", last_activated
revisions = callo(["git", "rev-list", base_commit + "..." + last_activated]).splitlines()