mirror of
https://github.com/mongodb/mongo.git
synced 2024-12-01 09:32:32 +01:00
Revert "SERVER-24636 Add option to burn_in_tests to specify githash to compare to"
This reverts commit e572d00484
.
This commit is contained in:
parent
1ab53c3631
commit
bebee51d86
@ -20,16 +20,7 @@ if __name__ == "__main__" and __package__ is None:
|
||||
|
||||
|
||||
def parse_command_line():
|
||||
parser = optparse.OptionParser(usage="Usage: %prog [options] [resmoke command]")
|
||||
|
||||
parser.add_option("--maxRevisions", dest="max_revisions",
|
||||
help="Maximum number of revisions to check for changes. Default is 25.")
|
||||
|
||||
parser.add_option("--branch", dest="branch",
|
||||
help="The name of the branch the working branch was based on.")
|
||||
|
||||
parser.add_option("--baseCommit", dest="base_commit",
|
||||
help="The base commit to compare to for determining changes.")
|
||||
parser = optparse.OptionParser()
|
||||
|
||||
parser.add_option("--noExec", dest="no_exec", action="store_true",
|
||||
help="Do not run resmoke loop on new tests.")
|
||||
@ -37,6 +28,9 @@ def parse_command_line():
|
||||
parser.add_option("--reportFile", dest="report_file",
|
||||
help="Write a JSON file with test executor information.")
|
||||
|
||||
parser.add_option("--resmokeCmd", dest="resmoke_cmd",
|
||||
help="Arguments to pass through to resmoke.py")
|
||||
|
||||
parser.add_option("--skipEnterpriseSuites", dest="no_enterprise", action="store_true",
|
||||
help="Do not run against enterprise specific executors.")
|
||||
|
||||
@ -45,10 +39,7 @@ def parse_command_line():
|
||||
|
||||
# The executor_file and suite_files defaults are required to make the
|
||||
# suite resolver work correctly.
|
||||
parser.set_defaults(base_commit=None,
|
||||
branch="master",
|
||||
executor_file="with_server",
|
||||
max_revisions=25,
|
||||
parser.set_defaults(executor_file="with_server",
|
||||
no_exec=False,
|
||||
no_enterprise=False,
|
||||
suite_files=None)
|
||||
@ -117,25 +108,15 @@ def callo(args):
|
||||
return check_output(args)
|
||||
|
||||
|
||||
def find_changed_tests(branch_name, base_commit, max_revisions):
|
||||
def find_changed_tests():
|
||||
"""
|
||||
Use git to find which files have changed in this patch.
|
||||
TODO: This should be expanded to search for enterprise modules.
|
||||
TODO: We should be able to specify a revision or parse like evergreen patch does.
|
||||
"""
|
||||
|
||||
changed_tests = []
|
||||
if base_commit is None:
|
||||
base_commit = callo(["git", "merge-base", branch_name + "@{upstream}", "HEAD"]).rstrip()
|
||||
revision_count = int(callo(["git", "rev-list", "--count", base_commit + "...HEAD"]))
|
||||
|
||||
if revision_count > max_revisions:
|
||||
print ("There are too many revisions included. This is likely "
|
||||
"because your base branch is not " + branch_name + ". "
|
||||
"You can allow us to review more than 25 revisions by using the "
|
||||
"--maxRevisions option.")
|
||||
return changed_tests
|
||||
|
||||
changed_files = callo(["git", "diff", "--name-only", base_commit])
|
||||
changed_files = callo(["git", "diff", "--name-only", "HEAD"])
|
||||
for line in changed_files.splitlines():
|
||||
line = line.rstrip()
|
||||
# Check that the file exists because it may have been moved or deleted in the patch.
|
||||
@ -228,7 +209,7 @@ def main():
|
||||
|
||||
# Run the executor finder.
|
||||
else:
|
||||
changed_tests = find_changed_tests(values.branch, values.base_commit, values.max_revisions)
|
||||
changed_tests = find_changed_tests()
|
||||
# If there are no changed tests, exit cleanly.
|
||||
if not changed_tests:
|
||||
print "No new or modified tests found."
|
||||
@ -253,9 +234,9 @@ def main():
|
||||
tests_by_executor.pop(executor)
|
||||
print "Skipping executor", executor
|
||||
elif not os.path.isfile(ekf2_file):
|
||||
print ("The mongo enterprise module is not installed. "
|
||||
"You may specify the --skipEnterpriseSuites flag to skip these "
|
||||
"test executors, or run against an enterprise build.")
|
||||
print "The mongo enterprise module is not installed."
|
||||
print "You may specify the --skipEnterpriseSuites flag to skip these"
|
||||
print "test executors, or run against an enterprise build."
|
||||
sys.exit(1)
|
||||
else:
|
||||
# We have the files to run enterprise executors.
|
||||
|
Loading…
Reference in New Issue
Block a user