diff options
| author | dalyd <david.daly@mongodb.com> | 2017-11-20 11:10:52 -0500 |
|---|---|---|
| committer | dalyd <david.daly@mongodb.com> | 2017-11-20 18:06:15 -0500 |
| commit | f6b8c4dea6b0f03632f86c29329eaa02d48ab803 (patch) | |
| tree | ae969125d99fc9824e930e2c26bf07a9cbd196ab | |
| parent | 8d82a4d0fbefa18bb4ed458164989afe6d9793ef (diff) | |
| download | mongo-f6b8c4dea6b0f03632f86c29329eaa02d48ab803.tar.gz | |
SERVER-32044: Use parameterized branch_name in performance projects
(cherry picked from commit 594cf2ef09a959ef94b8aa91473f1aedf1512144)
| -rw-r--r-- | etc/longevity.yml | 2 | ||||
| -rw-r--r-- | etc/perf.yml | 2 | ||||
| -rw-r--r-- | etc/system_perf.yml | 3 |
3 files changed, 3 insertions, 4 deletions
diff --git a/etc/longevity.yml b/etc/longevity.yml index 22b66deb46d..10b5081affc 100644 --- a/etc/longevity.yml +++ b/etc/longevity.yml @@ -222,7 +222,7 @@ functions: set -o verbose TAG="3.0.12-Baseline" PROJECT="mongo-longevity" - OVERRIDEFILE="../src/dsi/dsi/analysis/v3.2/longevity_override.json" + OVERRIDEFILE="../src/dsi/dsi/analysis/${branch_name}/longevity_override.json" python -u ../src/dsi/dsi/analysis/post_run_check.py ${script_flags} --reports-analysis reports --perf-file reports/perf.json --rev ${revision} -f history.json -t tags.json --refTag $TAG --overrideFile $OVERRIDEFILE --project_id $PROJECT --task_name ${task_name} --variant ${build_variant} tasks: diff --git a/etc/perf.yml b/etc/perf.yml index c066f380beb..d39e04e5a69 100644 --- a/etc/perf.yml +++ b/etc/perf.yml @@ -153,7 +153,7 @@ functions: reports_analysis_flags="--reports-analysis . --perf-file perf/perf.json" cmd_flags=$([ "${reports_analysis}" = "true" ] && echo "$reports_analysis_flags" || echo "") REFTAG="3.0.15-Baseline" - OVERRIDE="../dsi/analysis/v3.2/perf_override.json" # Note use of v3.2 here cannot use ${project} perf + OVERRIDE="../dsi/analysis/${branch_name}/perf_override.json" python ../dsi/analysis/perf_regression_check.py $cmd_flags -f history.json --rev ${revision} -t tags.json --refTag $REFTAG --overrideFile $OVERRIDE --variant ${build_variant} --task ${task_name} --threshold 0.10 --threadThreshold 0.15 "run perf tests": - command: shell.exec diff --git a/etc/system_perf.yml b/etc/system_perf.yml index 769befa1b28..ac29cf34480 100644 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -217,7 +217,6 @@ functions: script: | set -o errexit TAGS="3.2.17-Baseline" - PROJECT="sys-perf-3.2" OVERRIDEFILE="../src/dsi/dsi/analysis/v3.2/system_perf_override.json" python -u ../src/dsi/dsi/analysis/dashboard_gen.py --rev ${revision} -f history.json -t tags.json --refTag $TAGS --overrideFile $OVERRIDEFILE --project_id sys-perf --variant ${build_variant} --task ${task_name} --jira-user ${perf_jira_user} --jira-password ${perf_jira_pw} || true - command: "json.send" @@ -233,7 +232,7 @@ functions: set -o errexit set -o verbose TAG="3.2.17-Baseline" - OVERRIDEFILE="../src/dsi/dsi/analysis/v3.2/system_perf_override.json" + 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 reports/perf.json --rev ${revision} -f history.json -t tags.json --refTag $TAG --overrideFile $OVERRIDEFILE --project_id sys-perf --variant ${build_variant} --task ${task_name} ####################################### |