summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bradford <david.bradford@mongodb.com>2020-06-08 17:18:56 -0400
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-06-09 16:53:27 +0000
commit8194c3123c598b5bc866f108739d7b8368216cd7 (patch)
treec62ee117b8724c8d18f622cc3f4155d44c3b4759
parent43d25964249164d76d5e04dd6cf38f6111e21f5f (diff)
downloadmongo-8194c3123c598b5bc866f108739d7b8368216cd7.tar.gz
SERVER-48657: Use evergreen modules for performance signal-processing management
(cherry picked from commit 2f05f86f91359c7cebef7adf97b0ab624893ad00) (cherry picked from commit 1c196c94bd0f2f0b28a4952d6048776940889a94)
-rwxr-xr-xbuildscripts/signal_processing_setup.sh13
-rw-r--r--etc/perf.yml10
-rw-r--r--etc/system_perf.yml7
3 files changed, 19 insertions, 11 deletions
diff --git a/buildscripts/signal_processing_setup.sh b/buildscripts/signal_processing_setup.sh
index b582db3eb3b..b124247bd01 100755
--- a/buildscripts/signal_processing_setup.sh
+++ b/buildscripts/signal_processing_setup.sh
@@ -16,15 +16,6 @@ evergreen:
EOF
virtualenv -p /opt/mongodbtoolchain/v3/bin/python3 signal_processing_venv
-# Setup pip to use our internal PyPI
-cat > ./signal_processing_venv/pip.conf << EOF
-[global]
-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
-
source ./signal_processing_venv/bin/activate
-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
+pip install --upgrade pip
+pip install ../src/signal_processing/signal-processing
diff --git a/etc/perf.yml b/etc/perf.yml
index 3acf976445a..4a761968922 100644
--- a/etc/perf.yml
+++ b/etc/perf.yml
@@ -51,9 +51,11 @@ modules:
repo: git@github.com:10gen/mongo-enterprise-modules.git
prefix: src/mongo/db/modules
branch: v4.2
+
- name: genny
repo: git@github.com:mongodb/genny.git
branch: master
+
- name: dsi
repo: git@github.com:10gen/dsi.git
branch: master
@@ -62,6 +64,11 @@ modules:
repo: git@github.com:mongodb/mongo-perf.git
branch: master
+- name: signal-processing
+ repo: git@github.com:10gen/signal-processing.git
+ prefix: signal_processing
+ branch: master
+
functions:
"git get project": &git_get_project
command: git.get_project
@@ -72,6 +79,7 @@ functions:
genny: ${genny_rev}
dsi: ${dsi_rev}
mongo-perf: ${mongo-perf_rev}
+ signal-processing: ${signal-processing_rev}
"start server":
- command: s3.get
params:
@@ -600,6 +608,7 @@ buildvariants:
- genny
- dsi
- mongo-perf
+ - signal-processing
expansions:
# We are explicitly tracking the rhel62 variant compile options from evergreen.yml for
# microbenchmarks, since they run on the centos6 boxes. If we can get proper artifacts directly
@@ -650,6 +659,7 @@ buildvariants:
- genny
- dsi
- mongo-perf
+ - signal-processing
expansions:
mongod_exec_wrapper: *exec_wrapper
perf_exec_wrapper: *perf_wrapper
diff --git a/etc/system_perf.yml b/etc/system_perf.yml
index 7d365f1ed04..af6b9dbb17c 100644
--- a/etc/system_perf.yml
+++ b/etc/system_perf.yml
@@ -80,6 +80,7 @@ functions:
genny: ${genny_rev}
workloads: ${workloads_rev}
wtdevelop: ${wtdevelop_rev}
+ signal-processing: ${signal-processing_rev}
"compile mongodb":
# We create a virtual environment with the Python dependencies for compiling the server
@@ -887,6 +888,11 @@ modules:
prefix: src/mongo/db/modules
branch: v4.2
+- name: signal-processing
+ repo: git@github.com:10gen/signal-processing.git
+ prefix: signal_processing
+ branch: master
+
#######################################
# Buildvariants #
#######################################
@@ -972,6 +978,7 @@ buildvariants:
- genny
- workloads
- linkbench
+ - signal-processing
expansions:
setup: single-replica
cluster: single