0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 01:21:03 +01:00

SERVER-33657 Patch builds on windows-64-2k8-ssl and linux-64 fail

This commit is contained in:
Jonathan Abrahams 2018-03-07 18:24:24 -05:00
parent 825b3d8330
commit 789f74a383
2 changed files with 13 additions and 6 deletions

View File

@ -283,6 +283,19 @@ def main():
print("Extracting the following files from {0}...\n{1}".format(
filename, "\n".join(tarinfo.name for tarinfo in subdir)))
tar.extractall(members=subdir)
elif filename.startswith("mongo-src"):
print("Retrieving mongo source {}".format(filename))
# This is the distsrc.[tgz|zip] as referenced in evergreen.yml.
try:
urllib.urlretrieve(artifact["url"], filename)
except urllib.ContentTooShortError:
print("The artifact {} could not be completely downloaded. Default"
" compile bypass to false.".format(filename))
return
extension = os.path.splitext(filename)[1]
distsrc_filename = "distsrc{}".format(extension)
print("Renaming {} to {}".format(filename, distsrc_filename))
os.rename(filename, distsrc_filename)
else:
print("Linking base artifact {} to this patch build".format(filename))
# For other artifacts we just add their URLs to the JSON file to upload.

View File

@ -633,12 +633,6 @@ functions:
set -o verbose
set -o errexit
### TODO - Remove this temporary disabling of bypass compile when SERVER-33657
### is fully implemented.
if [ ${build_variant} = "linux-64" ] || [ ${build_variant} = "windows-64-2k8-ssl" ]; then
exit 0
fi
###
# For patch builds determine if we can bypass compile.
if [ "${is_patch}" = "true" ]; then
${activate_virtualenv}