diff options
| author | Henrik Ingo <henrik.ingo@mongodb.com> | 2018-05-24 19:46:42 +0300 |
|---|---|---|
| committer | Henrik Ingo <henrik.ingo@mongodb.com> | 2018-05-25 18:13:39 +0300 |
| commit | 45b0966fd22c8c22284c591c59f9b3b4b7f12ad4 (patch) | |
| tree | 9b6bc7f9491562371964dce91f3903eabe1aa1a5 | |
| parent | 67bc1f44ec5be1564d549ff69a571a33f3cbdb99 (diff) | |
| download | mongo-45b0966fd22c8c22284c591c59f9b3b4b7f12ad4.tar.gz | |
SERVER-35207 Don't use json.get_history in system_perf.yml
(cherry picked from commit 81f3e81d6b0f6ae23a422b47e9e58262de816cd7)
| -rw-r--r-- | etc/longevity.yml | 14 | ||||
| -rw-r--r-- | etc/system_perf.yml | 30 |
2 files changed, 2 insertions, 42 deletions
diff --git a/etc/longevity.yml b/etc/longevity.yml index 9cdf9502fa7..c045bc83f62 100644 --- a/etc/longevity.yml +++ b/etc/longevity.yml @@ -175,19 +175,7 @@ functions: cat perf.json | egrep "name|ops_per_sec" "analyze": - - command: json.get_history - params: - task: ${task_name} - file: "work/history.json" - name: "perf" - - command: json.get_history - params: - tags: true - task: ${task_name} - file: "work/tags.json" - name: "perf" - command: shell.exec - # post_run_check.py and longevity_override.json for DSI tests are part of dsi repo type : test params: working_dir: work @@ -197,7 +185,7 @@ functions: TAG="3.2.1-Baseline" PROJECT="mongo-longevity" 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 perf.json --rev ${revision} -f history.json -t tags.json --refTag $TAG --overrideFile $OVERRIDEFILE --project_id $PROJECT --task_name ${task_name} --variant ${build_variant} + 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 $PROJECT --task_name ${task_name} --variant ${build_variant} tasks: - name: compile diff --git a/etc/system_perf.yml b/etc/system_perf.yml index 8f62a401e5b..051dd37175c 100644 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -282,34 +282,6 @@ functions: file: "work/perf.json" "analyze": - - command: json.get_history - params: - task: ${task_name} - file: "work/history.json" - name: "perf" - - command: json.get_history - params: - tags: true - task: ${task_name} - file: "work/tags.json" - name: "perf" - - command: shell.exec - # generate dashboard data - type : test - params: - working_dir: work - silent: true - script: | - set -o errexit - TAGS="3.2.17-Baseline 3.4.9-Baseline" - 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: - name: "dashboard" - file: "work/dashboard.json" - - command: shell.exec - # post_run_check.py and override.json for DSI tests are part of dsi repo type : test params: working_dir: work @@ -318,7 +290,7 @@ functions: set -o verbose TAG="3.2.17-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} -f history.json -t tags.json --refTag $TAG --overrideFile $OVERRIDEFILE --project_id sys-perf --variant ${build_variant} --task ${task_name} + 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} ####################################### # Tasks # |