diff options
| -rw-r--r-- | etc/perf.yml | 68 | ||||
| -rwxr-xr-x | etc/system_perf.yml | 21 |
2 files changed, 39 insertions, 50 deletions
diff --git a/etc/perf.yml b/etc/perf.yml index d2c2eac72eb..d3dd6ea4c75 100644 --- a/etc/perf.yml +++ b/etc/perf.yml @@ -130,36 +130,6 @@ functions: - command: shell.exec params: working_dir: src - script: | - cat > bootstrap.yml <<EOF - infrastructure_provisioning: ${cluster} - platform: ${platform} - mongodb_setup: ${setup} - storageEngine: ${storageEngine} - test_control: ${test} - production: true - EOF - - cat > runtime.yml <<EOF - # evergreen default expansions - is_patch: ${is_patch} - task_id: ${task_id} - EOF - - cp ./dsi/configurations/analysis/analysis.common.yml analysis.yml - - command: shell.exec - params: - working_dir: src - silent: true - script: | - cat > runtime_secret.yml <<EOF - dsi_analysis_atlas_user: "${dsi_analysis_atlas_user}" - dsi_analysis_atlas_pw: "${dsi_analysis_atlas_pw}" - EOF - chmod 400 runtime_secret.yml - - command: shell.exec - params: - working_dir: src silent: true script: | set -o errexit @@ -180,6 +150,34 @@ functions: source ./signal_processing_venv/bin/activate detect-changes --evergreen-api-config .evergreen.yml - command: shell.exec + params: + working_dir: src + script: | + set -o errexit + set -o verbose + cat > overrides.yml <<EOF + bootstrap: + production: true + test_control: + reports_dir_basename: .. + runtime: + # evergreen default expansions + is_patch: ${is_patch} + task_id: ${task_id} + EOF + + cp ./dsi/configurations/analysis/analysis.microbenchmarks.yml analysis.yml + - command: shell.exec + params: + working_dir: src + silent: true + script: | + cat > runtime_secret.yml <<EOF + dsi_analysis_atlas_user: "${dsi_analysis_atlas_user}" + dsi_analysis_atlas_pw: "${dsi_analysis_atlas_pw}" + EOF + chmod 400 runtime_secret.yml + - command: shell.exec type: test params: working_dir: src @@ -188,15 +186,7 @@ functions: set -o verbose ./dsi/run-dsi setup source ./dsi/dsi_venv/bin/activate - - # Any tasks that want the analysis scripts to analyze mongod.log files should pass in - # `reports_analysis: true` as a var to this function. The following line will select the - # appropriate flags if it's `true`. - reports_analysis_flags="--reports-analysis . --perf-file perf/perf.json" - cmd_flags=$([ "${reports_analysis}" = "true" ] && echo "$reports_analysis_flags" || echo "") - REFTAG="3.6.5-Baseline" - OVERRIDE="./dsi/analysis/${branch_name}/perf_override.json" - python ./dsi/analysis/perf_regression_check.py $cmd_flags --rev ${revision} --refTag $REFTAG --overrideFile $OVERRIDE --variant ${build_variant} --task ${task_name} --threshold 0.075 --threadThreshold 0.12 + ./dsi/bin/analysis.py # Params: # workload: the path relative to genny/src/workloads to run e.g. diff --git a/etc/system_perf.yml b/etc/system_perf.yml index 7c0eb30c8fc..269c2410862 100755 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -336,6 +336,16 @@ functions: "analyze": - command: shell.exec + type: test + params: + working_dir: work + script: | + set -o verbose + source ./dsienv.sh + ../src/dsi/dsi/run-dsi analysis.py + # detect outliers needs to run, so defer the post_run_check exit status to later + echo $? > post_run_check.status + - command: shell.exec params: working_dir: work silent: true @@ -358,17 +368,6 @@ functions: source ./signal_processing_venv/bin/activate detect-changes --evergreen-api-config .evergreen.yml - command: shell.exec - type: test - params: - working_dir: work - script: | - set -o verbose - TAG="4.0.2-Baseline" - OVERRIDEFILE="../src/dsi/dsi/analysis/${branch_name}/system_perf_override.json" - python -u ../src/dsi/dsi/analysis/post_run_check.py ${script_flags} --reports-analysis reports --perf-file perf.json --rev ${revision} --refTag $TAG --overrideFile $OVERRIDEFILE --project_id sys-perf --variant ${build_variant} --task ${task_name} - # detect outliers needs to run, so defer the post_run_check exit status to later - echo $? > post_run_check.status - - command: shell.exec params: working_dir: work script: | |