SERVER-35018: Enable signal processing in system_perf.yml.

(cherry picked from commit 133a00391a0d8ee80ccfd096d5771db710f7f2e8)

1 files changed, 34 insertions, 32 deletions

diff --git a/etc/system_perf.yml b/etc/system_perf.yml
index a461eb3fb5b..8e5bf1de072 100644
--- a/etc/system_perf.yml
+++ b/etc/system_perf.yml
@@ -15,7 +15,7 @@ post:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
         local_file: work/dsi-artifacts.tgz
-        remote_file: ${project}/${build_variant}/${revision}/${task_id}/${version_id}/logs/dsi-artifacts-${task_name}-${build_id}-${execution}.${ext|tgz}
+        remote_file: ${project_dir}/${build_variant}/${revision}/${task_id}/${version_id}/logs/dsi-artifacts-${task_name}-${build_id}-${execution}.${ext|tgz}
         bucket: mciuploads
         permissions: public-read
         content_type: ${content_type|application/x-gzip}
@@ -25,7 +25,7 @@ post:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
         local_file: src/workloads/workloads/jsdoc/jsdocs-redirect.html
-        remote_file: ${project}/${build_variant}/${revision}/${task_id}/${version_id}/logs/workloads-${task_name}-${build_id}.html
+        remote_file: ${project_dir}/${build_variant}/${revision}/${task_id}/${version_id}/logs/workloads-${task_name}-${build_id}.html
         bucket: mciuploads
         permissions: public-read
         content_type: text/html
@@ -142,7 +142,7 @@ functions:
         aws_key: ${aws_key}
         aws_secret: ${aws_secret}
         local_file: src/mongodb${wtdevelop|}.tar.gz
-        remote_file: ${project}/${version_id}/${revision}/${platform}/mongodb${wtdevelop|}-${version_id}.tar.gz
+        remote_file: ${project_dir}/${version_id}/${revision}/${platform}/mongodb${wtdevelop|}-${version_id}.tar.gz
         bucket: mciuploads
         permissions: public-read
         content_type: ${content_type|application/x-gzip}
@@ -188,7 +188,7 @@ functions:
           storageEngine: ${storageEngine}
           test_control: ${test}
           production: true
-          mongodb_binary_archive: "https://s3.amazonaws.com/mciuploads/${project}/${version_id}/${revision}/${platform}/mongodb${wtdevelop|}-${version_id}.tar.gz"
+          mongodb_binary_archive: "https://s3.amazonaws.com/mciuploads/${project_dir}/${version_id}/${revision}/${platform}/mongodb${wtdevelop|}-${version_id}.tar.gz"
           workloads_dir: ../src/workloads/workloads
           ycsb_dir: ../src/YCSB/YCSB
           linkbench_dir: ../src/linkbench/linkbench
@@ -206,7 +206,7 @@ functions:
           version_id: ${version_id}
           workdir: ${workdir}
           revision: ${revision}
-          project: ${project}
+          project_dir: ${project_dir}
           branch_name: ${branch_name}
 
           # sys-perf expansions
@@ -216,6 +216,7 @@ functions:
           dsi_rev: ${dsi_rev}
           workloads_rev: ${workloads_rev}
           EOF
+
     - command: shell.exec
       params:
         silent: true
@@ -232,6 +233,7 @@ functions:
           aws_secret_key: "${terraform_secret}"
           perf_jira_user: "${perf_jira_user}"
           perf_jira_pw: "${perf_jira_pw}"
+          dsi_analysis_atlas_pw: "${dsi_analysis_atlas_pw}"
           EOF
           chmod 400 runtime_secret.yml
     - command: shell.exec
@@ -241,10 +243,7 @@ functions:
         # configure environment, has private information, no logging
         script: |
           set -e
-          virtualenv ./venv
-          source ./venv/bin/activate
-          pip install -r ../src/dsi/dsi/requirements.txt
-          python ../src/dsi/dsi/bin/bootstrap.py
+          ../src/dsi/dsi/run-dsi python ../src/dsi/dsi/bin/bootstrap.py
     - command: shell.exec
       params:
         script: |
@@ -262,10 +261,9 @@ functions:
           set -e
           set -v
           source ./dsienv.sh
-          source ./venv/bin/activate
-          infrastructure_provisioning.py
-          workload_setup.py
-          mongodb_setup.py
+          ../src/dsi/dsi/run-dsi infrastructure_provisioning.py
+          ../src/dsi/dsi/run-dsi workload_setup.py
+          ../src/dsi/dsi/run-dsi mongodb_setup.py
 
   "run test":
     - command: shell.exec
@@ -276,8 +274,7 @@ functions:
           set -e
           set -v
           source ./dsienv.sh
-          source ./venv/bin/activate
-          test_control.py
+          ../src/dsi/dsi/run-dsi test_control.py
     - command: "json.send"
       params:
          name: "perf"
@@ -285,6 +282,11 @@ functions:
 
   "analyze":
     - command: shell.exec
+      params:
+        working_dir: work
+        script: |
+          ../src/dsi/dsi/run-dsi detect-changes
+    - command: shell.exec
       type : test
       params:
         working_dir: work
@@ -634,7 +636,7 @@ buildvariants:
     compile_flags: --ssl MONGO_DISTMOD=rhel70 -j$(grep -c ^processor /proc/cpuinfo) --release --variables-files=etc/scons/mongodbtoolchain_gcc.vars
     gorootvars: GOROOT=/opt/go PATH="/opt/go/bin:$PATH"
     platform: linux
-    project: &project dsi
+    project_dir: &project_dir dsi
     tooltags: ""
     use_scons_cache: true
   run_on:
@@ -658,7 +660,7 @@ buildvariants:
     setup: single-replica
     cluster: single
     platform: linux
-    project: *project
+    project_dir: *project_dir
     authentication: enabled
     storageEngine: wiredTiger
   run_on:
@@ -690,7 +692,7 @@ buildvariants:
     setup: standalone
     cluster: single
     platform: linux
-    project: *project
+    project_dir: *project_dir
     authentication: enabled
     storageEngine: wiredTiger
   run_on:
@@ -717,7 +719,7 @@ buildvariants:
     setup: shard
     cluster: shard
     platform: linux
-    project: *project
+    project_dir: *project_dir
     authentication: enabled
     storageEngine: wiredTiger
   run_on:
@@ -751,7 +753,7 @@ buildvariants:
     setup: shard-lite
     cluster: shard-lite
     platform: linux
-    project: *project
+    project_dir: *project_dir
     authentication: disabled
     storageEngine: wiredTiger
   run_on:
@@ -782,7 +784,7 @@ buildvariants:
     setup: replica
     cluster: replica
     platform: linux
-    project: *project
+    project_dir: *project_dir
     authentication: enabled
     storageEngine: wiredTiger
   run_on:
@@ -818,8 +820,8 @@ buildvariants:
     setup: replica-2node
     cluster: replica
     platform: linux
-    project: *project
     storageEngine: wiredTiger
+    project_dir: *project_dir
   depends_on:
       - name: compile
         variant: compile-rhel70
@@ -836,8 +838,8 @@ buildvariants:
     setup: initialsync-logkeeper
     cluster: initialsync-logkeeper
     platform: linux
-    project: *project
     storageEngine: wiredTiger
+    project_dir: *project_dir
   run_on:
       - "rhel70-perf-initialsync-logkeeper"
   depends_on:
@@ -857,7 +859,7 @@ buildvariants:
     setup: single-replica
     cluster: single
     platform: linux
-    project: *project
+    project_dir: *project_dir
     authentication: enabled
     storageEngine: "mmapv1"
   run_on:
@@ -884,7 +886,7 @@ buildvariants:
     setup: standalone
     cluster: single
     platform: linux
-    project: *project
+    project_dir: *project_dir
     authentication: enabled
     storageEngine: "mmapv1"
   run_on:
@@ -911,7 +913,7 @@ buildvariants:
     setup: shard
     cluster: shard
     platform: linux
-    project: *project
+    project_dir: *project_dir
     authentication: enabled
     storageEngine: "mmapv1"
   run_on:
@@ -940,7 +942,7 @@ buildvariants:
     setup: replica
     cluster: replica
     platform: linux
-    project: *project
+    project_dir: *project_dir
     authentication: enabled
     storageEngine: "mmapv1"
   run_on:
@@ -969,7 +971,7 @@ buildvariants:
     setup: replica-2node
     cluster: replica
     platform: linux
-    project: *project
+    project_dir: *project_dir
     storageEngine: "mmapv1"
   run_on:
       - "rhel70-perf-replset"
@@ -990,7 +992,7 @@ buildvariants:
     setup: single-replica
     cluster: single
     platform: linux
-    project: *project
+    project_dir: *project_dir
     wtdevelop: -wtdevelop
     authentication: enabled
     storageEngine: wiredTiger
@@ -1009,7 +1011,7 @@ buildvariants:
     setup: standalone
     cluster: single
     platform: linux
-    project: *project
+    project_dir: *project_dir
     wtdevelop: -wtdevelop
     authentication: enabled
     storageEngine: wiredTiger
@@ -1028,7 +1030,7 @@ buildvariants:
     setup: replica
     cluster: replica
     platform: linux
-    project: *project
+    project_dir: *project_dir
     wtdevelop: -wtdevelop
     authentication: enabled
     storageEngine: wiredTiger
@@ -1047,7 +1049,7 @@ buildvariants:
     setup: shard-lite
     cluster: shard-lite
     platform: linux
-    project: *project
+    project_dir: *project_dir
     wtdevelop: -wtdevelop
     authentication: enabled
     storageEngine: wiredTiger