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

2 files changed, 13 insertions, 6 deletions

diff --git a/buildscripts/bypass_compile_and_fetch_binaries.py b/buildscripts/bypass_compile_and_fetch_binaries.py
index cd60bfba44b..ca184e1e046 100644
--- a/buildscripts/bypass_compile_and_fetch_binaries.py
+++ b/buildscripts/bypass_compile_and_fetch_binaries.py
@@ -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.
diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index d99d7209d19..29b4736433b 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -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}