diff options
| author | Jeff Zambory <jeff.zambory@mongodb.com> | 2020-03-17 10:44:14 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-03-17 16:02:35 +0000 |
| commit | ab8166fcd2855cc71e895101f5d7e6450b9ae8ed (patch) | |
| tree | 9285c36e2f83b421be69d09cc5b68927c60cc96c | |
| parent | ff506e4e333a1ff03ea30ea2ba9cb40ba87a47d4 (diff) | |
| download | mongo-ab8166fcd2855cc71e895101f5d7e6450b9ae8ed.tar.gz | |
SERVER-45867 Use latest version of signal-processing
(cherry picked from commit 889af79abadc442ad9277fa87cb4340654bdf8c0)
# Conflicts:
# buildscripts/signal_processing_setup.sh
# etc/perf.yml
# etc/system_perf.yml
| -rwxr-xr-x | buildscripts/signal_processing_setup.sh | 19 | ||||
| -rw-r--r-- | etc/perf.yml | 2 | ||||
| -rw-r--r-- | etc/system_perf.yml | 4 |
3 files changed, 11 insertions, 14 deletions
diff --git a/buildscripts/signal_processing_setup.sh b/buildscripts/signal_processing_setup.sh index 66ffbef281b..b582db3eb3b 100755 --- a/buildscripts/signal_processing_setup.sh +++ b/buildscripts/signal_processing_setup.sh @@ -5,10 +5,14 @@ if [[ -d "signal_processing_venv" ]]; then fi # Configure signal processing -cat > ./analysis.yml << EOF -mongo_uri: mongodb+srv://\${analysis_user}:\${analysis_password}@performancedata-g6tsc.mongodb.net/perf -is_patch: ${is_patch} +cat > .signal-processing.yml << EOF task_id: ${task_id} +is_patch: ${is_patch} +mongo_uri: mongodb+srv://${dsi_analysis_atlas_user}:${dsi_analysis_atlas_pw}@performancedata-g6tsc.mongodb.net/perf +evergreen: + api_key: "${evergreen_api_key}" + user: "${evergreen_api_user}" + api_server_host: https://evergreen.mongodb.com EOF virtualenv -p /opt/mongodbtoolchain/v3/bin/python3 signal_processing_venv @@ -19,15 +23,8 @@ index-url = https://pypi.org/simple extra-index-url = https://${perf_jira_user}:${perf_jira_pw}@artifactory.corp.mongodb.com/artifactory/api/pypi/mongodb-dag-local/simple EOF -# Create the Evergreen API credentials -cat > .evergreen.yml <<END_OF_CREDS -api_server_host: https://evergreen.mongodb.com/api -api_key: "${evergreen_api_key}" -user: "${evergreen_api_user}" -END_OF_CREDS - source ./signal_processing_venv/bin/activate -pip install dag-signal-processing~=1.0.14 +pip install dag-signal-processing~=2.0.0 export analysis_user="${dsi_analysis_atlas_user}" export analysis_password="${dsi_analysis_atlas_pw}"
\ No newline at end of file diff --git a/etc/perf.yml b/etc/perf.yml index ddcf44a792d..f7b20632049 100644 --- a/etc/perf.yml +++ b/etc/perf.yml @@ -141,7 +141,7 @@ functions: evergreen_api_key=${evergreen_api_key} evergreen_api_user=${evergreen_api_user} source ./buildscripts/signal_processing_setup.sh - detect-changes --evergreen-api-config .evergreen.yml + detect-changes --config .signal-processing.yml - command: json.get_history params: task: ${task_name} diff --git a/etc/system_perf.yml b/etc/system_perf.yml index 6bbcbb7db04..a80c24c61e2 100644 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -337,13 +337,13 @@ functions: evergreen_api_key=${evergreen_api_key} evergreen_api_user=${evergreen_api_user} source ../src/buildscripts/signal_processing_setup.sh - detect-changes --evergreen-api-config .evergreen.yml + detect-changes --config .signal-processing.yml - command: shell.exec params: working_dir: work script: | source ../src/buildscripts/signal_processing_setup.sh - detect-outliers --evergreen-api-config .evergreen.yml + detect-outliers --config .signal-processing.yml "upload pip requirements": command: s3.put |