Revert "SERVER-43903 Always upload cache and config logs for all compiles"

This reverts commit 00bdfa2345f6142fb0f4696d21e64d5921a54c60.

1 files changed, 24 insertions, 39 deletions

diff --git a/etc/evergreen.yml b/etc/evergreen.yml
index 4d1b890c5e4..e167e332557 100644
--- a/etc/evergreen.yml
+++ b/etc/evergreen.yml
@@ -193,7 +193,7 @@ variables:
   - func: "apply compile expansions"
   - func: "set task expansion macros"
   teardown_task:
-  - func: "attach scons logs"
+  - func: "attach scons config log"
   - func: "attach report"
   - func: "attach artifacts"
   - func: "kill processes"
@@ -313,7 +313,6 @@ variables:
     - func: "apply compile expansions"
     - func: "set task expansion macros"
   teardown_task:
-  - func: "attach scons logs"
   setup_group_can_fail_task: true
   setup_group:
     - func: "kill processes"
@@ -1847,6 +1846,10 @@ functions:
             ${targets} MONGO_VERSION=${version} || exit_status=$?
         # If compile fails we do not run any tests
         if [[ $exit_status -ne 0 ]]; then
+          if [[ "${dump_scons_config_on_failure}" == true ]]; then
+            echo "Dumping build/scons/config.log"
+            cat build/scons/config.log
+          fi
           touch ${skip_tests}
         fi
         exit $exit_status
@@ -3709,30 +3712,18 @@ functions:
   - *archive_system_resource_information
 
   ### Attach report & artifacts ###
-  "attach scons logs":
-    - command: s3.put
-      params:
-        optional: true
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        local_file: src/build/scons/config.log
-        remote_file: ${project}/${build_variant}/${revision}/artifacts/scons-config.log.${build_id}-${task_name}-${execution}
-        bucket: mciuploads
-        permissions: public-read
-        content_type: text/plain
-        display_name: SCons configure log
-
-    - command: s3.put
-      params:
-        optional: true
-        aws_key: ${aws_key}
-        aws_secret: ${aws_secret}
-        local_file: src/scons_cache.log
-        content_type: text/plain
-        remote_file: ${project}/${build_variant}/${revision}/artifacts/scons-cache.log.${build_id}-${task_name}.${execution}
-        bucket: mciuploads
-        permissions: public-read
-        display_name: SCons cache debug log
+  "attach scons config log":
+    command: s3.put
+    params:
+      optional: true
+      aws_key: ${aws_key}
+      aws_secret: ${aws_secret}
+      local_file: src/build/scons/config.log
+      remote_file: ${project}/${build_variant}/${revision}/artifacts/config-${build_id}.log
+      bucket: mciuploads
+      permissions: public-read
+      content_type: text/plain
+      display_name: config.log
 
   "attach report":
     command: attach.results
@@ -3877,17 +3868,15 @@ tasks:
         display_name: Artifacts
     - command: s3.put
       params:
+        optional: true
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
-        local_file: src/distsrc.${ext|tgz}
-        remote_file: ${project}/${build_variant}/${revision}/sources/mongo-src-${build_id}.${ext|tgz}
+        local_file: src/scons_cache.log
+        content_type: text/plain
+        remote_file: ${project}/${build_variant}/${revision}/scons-cache-${build_id}-${execution}.log
         bucket: mciuploads
         permissions: public-read
-        content_type: ${content_type|application/gzip}
-        display_name: Source tarball
-        # We only need to upload the source tarball from one of the build variants
-        # because it should be the same everywhere, so just use rhel70/windows.
-        build_variants: [rhel70, windows]
+        display_name: SCons cache debug log
     # For patch builds that bypass compile, we upload links to pre-existing tarballs, except for the
     # artifacts.tgz.
     - command: attach.artifacts
@@ -4366,7 +4355,6 @@ tasks:
       vars:
         targets: install-benchmarks
         compiling_for_test: true
-    - func: "attach scons logs"
     - command: archive.targz_pack
       params:
         target: "benchmarks.tgz"
@@ -5813,7 +5801,6 @@ tasks:
       bypass_compile: false
       task_compile_flags: >-
         --detect-odr-violations
-  - func: "attach scons logs"
   - func: "run tests"
     vars:
       resmoke_args: --suites=integration_tests_standalone --storageEngine=wiredTiger
@@ -5835,7 +5822,6 @@ tasks:
       bypass_compile: false
       task_compile_flags: >-
         --detect-odr-violations
-  - func: "attach scons logs"
   - func: "run tests"
     vars:
       resmoke_args: --suites=integration_tests_standalone_audit --storageEngine=wiredTiger
@@ -5857,7 +5843,6 @@ tasks:
       bypass_compile: false
       task_compile_flags: >-
         --detect-odr-violations
-  - func: "attach scons logs"
   - func: "run tests"
     vars:
       resmoke_args: --suites=integration_tests_replset --storageEngine=wiredTiger
@@ -5879,7 +5864,6 @@ tasks:
       bypass_compile: false
       task_compile_flags: >-
         --detect-odr-violations
-  - func: "attach scons logs"
   - func: "run tests"
     vars:
       resmoke_args: --suites=integration_tests_sharded --storageEngine=wiredTiger
@@ -8670,7 +8654,6 @@ task_groups:
     - func: "set task expansion macros"
     - func: "apply compile expansions"
   teardown_task:
-      - func: "attach scons logs"
   tasks:
   - "embedded_sdk_build_cdriver"
   - "embedded_sdk_install_dev"
@@ -10094,6 +10077,7 @@ buildvariants:
         -DENABLE_ZLIB=BUNDLED
         -DCMAKE_C_FLAGS="-Wunguarded-availability"
     disable_unit_tests: true
+    dump_scons_config_on_failure: true
   tasks:
   - name: embedded_sdk_build_and_test
 
@@ -10115,6 +10099,7 @@ buildvariants:
         -DCMAKE_C_FLAGS="-flto"
         -DCMAKE_INSTALL_RPATH=\$ORIGIN/../lib
     disable_unit_tests: true
+    dump_scons_config_on_failure: true
   tasks:
   - name: embedded_sdk_build_and_test