diff options
| author | dalyd <david.daly@mongodb.com> | 2017-11-20 11:10:52 -0500 |
|---|---|---|
| committer | dalyd <david.daly@mongodb.com> | 2017-11-20 21:04:23 -0500 |
| commit | 25946068b27c2c172a97aaa60f053a14e547d1e8 (patch) | |
| tree | 9b4129f4b5c2b1d562842f963486bcd234f1b138 | |
| parent | 56a1d0887ba26a9d760eba2237643d17932d2e29 (diff) | |
| download | mongo-25946068b27c2c172a97aaa60f053a14e547d1e8.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 | 5 | ||||
| -rw-r--r-- | etc/system_perf.yml | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/etc/longevity.yml b/etc/longevity.yml index 765b3817588..5d5cffa1168 100644 --- a/etc/longevity.yml +++ b/etc/longevity.yml @@ -232,7 +232,7 @@ functions: set -o verbose TAG="3.2.1-Baseline" PROJECT="mongo-longevity" - OVERRIDEFILE="../src/dsi/dsi/analysis/master/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 c461c426087..eb27baacb13 100644 --- a/etc/perf.yml +++ b/etc/perf.yml @@ -160,9 +160,8 @@ functions: source ./venv/bin/activate REFTAGS="3.4.9-Baseline 3.2.17-Baseline 3.0.15-Baseline" # These are project specific # Project Opts are project specific, but don't match expansion from elsewhere. - # We could change dsi/analysis/master to dsi/analysis/perf in DSI to get dsi/analysis/${project}/perf_override.json # Note project_id performance doesn't match string perf used elsewhere for ${project} - PROJECT_OPTS="--overrideFile ../dsi/analysis/master/perf_override.json --project_id performance" + PROJECT_OPTS="--overrideFile ../dsi/analysis/${branch_name}/perf_override.json --project_id performance" python -u ../dsi/analysis/dashboard_gen.py --rev ${revision} -f history.json -t tags.json --refTag $REFTAGS $PROJECT_OPTS --variant ${build_variant} --task ${task_name} --jira-user ${perf_jira_user} --jira-password ${perf_jira_pw} || true - command: "json.send" params: @@ -183,7 +182,7 @@ functions: reports_analysis_flags="--reports-analysis . --perf-file perf/perf.json" cmd_flags=$([ "${reports_analysis}" = "true" ] && echo "$reports_analysis_flags" || echo "") REFTAG="3.4.9-Baseline" - OVERRIDE="../dsi/analysis/master/perf_override.json" # Note use of master here cannot use ${project} + 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.075 --threadThreshold 0.12 "run perf tests": - command: shell.exec diff --git a/etc/system_perf.yml b/etc/system_perf.yml index b1693f0c3e2..2abe5a876bb 100644 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -215,7 +215,7 @@ functions: script: | set -o errexit TAGS="3.4.9-Baseline 3.2.17-Baseline" - OVERRIDEFILE="../src/dsi/dsi/analysis/master/system_perf_override.json" + OVERRIDEFILE="../src/dsi/dsi/analysis/${branch_name}/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" params: @@ -230,7 +230,7 @@ functions: set -o errexit set -o verbose TAG="3.4.9-Baseline" - OVERRIDEFILE="../src/dsi/dsi/analysis/master/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} ####################################### |