From 55208a316dd277c71138f3ed4d0338fb73e77b08 Mon Sep 17 00:00:00 2001 From: Carl Raiden Worley Date: Wed, 26 May 2021 22:24:51 -0400 Subject: SERVER-57172 Do json.send before DSI post_run --- etc/perf.yml | 8 ++++---- etc/system_perf.yml | 14 +++++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/etc/perf.yml b/etc/perf.yml index bdea8a606cf..9ee0b4b584c 100644 --- a/etc/perf.yml +++ b/etc/perf.yml @@ -164,16 +164,16 @@ functions: params: script: ./src/dsi/run-dsi determine_failure -m TEST f_dsi_post_run: + - command: json.send + params: + name: perf + file: ./build/LegacyPerfJson/perf.json - command: shell.exec params: script: ./src/dsi/run-dsi post_run - command: attach.results params: file_location: ./build/EvergreenResultsJson/results.json - - command: json.send - params: - name: perf - file: ./build/LegacyPerfJson/perf.json - command: s3.put params: aws_key: ${aws_key} diff --git a/etc/system_perf.yml b/etc/system_perf.yml index 7aa891a1b96..9fd164454f5 100644 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -21,7 +21,9 @@ variables: - name: compile variant: compile-rhel70 _real_expansions: &_expansion_updates - [] + # TODO: Disable in SERVER-57226. + - key: enable_detect_changes + value: "true" ### ### @@ -176,16 +178,18 @@ functions: params: script: ./src/dsi/run-dsi determine_failure -m TEST f_dsi_post_run: + # TODO: SERVER-57226 will let us move this json.send to after dsi's post_run. + # This is preferred to keep DSI execution contiguous. + - command: json.send + params: + name: perf + file: ./build/LegacyPerfJson/perf.json - command: shell.exec params: script: ./src/dsi/run-dsi post_run - command: attach.results params: file_location: ./build/EvergreenResultsJson/results.json - - command: json.send - params: - name: perf - file: ./build/LegacyPerfJson/perf.json - command: s3.put params: aws_key: ${aws_key} -- cgit v1.2.1