diff options
| author | Shane Harvey <shane.harvey@mongodb.com> | 2016-05-16 12:03:16 -0400 |
|---|---|---|
| committer | Shane Harvey <shane.harvey@mongodb.com> | 2016-05-25 18:30:51 -0400 |
| commit | 5c3534c9b4d621ff57b3dbca6a259ebd1b10322c (patch) | |
| tree | 35d3255f3d4f1c32085686a9fc3da2ff395cd507 | |
| parent | fe2e46b3b6b41865da447e957ed2b29f1c1bfef6 (diff) | |
| download | mongo-5c3534c9b4d621ff57b3dbca6a259ebd1b10322c.tar.gz | |
SERVER-24260 Update system_perf.yml to use mongodb setup script
(cherry picked from commit 65d8fd53c71270c58f3f14e13b4221e5c6c0358b)
| -rw-r--r-- | etc/distributed_correctness.yml | 6 | ||||
| -rw-r--r-- | etc/longevity.yml | 4 | ||||
| -rw-r--r-- | etc/system_perf.yml | 6 |
3 files changed, 11 insertions, 5 deletions
diff --git a/etc/distributed_correctness.yml b/etc/distributed_correctness.yml index a54597ca857..47620902af3 100644 --- a/etc/distributed_correctness.yml +++ b/etc/distributed_correctness.yml @@ -65,7 +65,7 @@ functions: bin/setup-cluster.sh ${cluster} echo "EC2 Cluster CREATED." touch terraform.tfstate.backup - tar -czvf cluster_config.tgz ips.sh terraform.tfstate.backup terraform.tfstate + tar -czvf cluster_config.tgz ips.sh ips.py terraform.tfstate.backup terraform.tfstate - command: s3.put params: aws_key: ${aws_key} @@ -103,8 +103,9 @@ functions: script: | set -e set -v + source ./venv/bin/activate cd ./clusters/${cluster} - ../../bin/configure-mongodb-cluster.sh ${setup} ${storageEngine} + ../../bin/mongodb_setup.py ${setup} ${storageEngine} echo "${cluster} MongoDB Cluster STARTED." "run test": @@ -154,6 +155,7 @@ functions: cd ./clusters/${cluster}/reports # move additional file here cp ../ips.sh . + cp ../ips.py . if [ -f "../terraform.log" ]; then cp ../terraform.log .; fi cp ../../perf.json . cd .. diff --git a/etc/longevity.yml b/etc/longevity.yml index 3ff3df554b8..c2746024d60 100644 --- a/etc/longevity.yml +++ b/etc/longevity.yml @@ -74,8 +74,9 @@ functions: script: | set -e set -o verbose + source ./venv/bin/activate cd ./clusters/${cluster} - ../../bin/configure-mongodb-cluster.sh ${setup} ${storageEngine} + ../../bin/mongodb_setup.py ${setup} ${storageEngine} echo "${cluster} MongoDB Cluster STARTED." "run test": @@ -126,6 +127,7 @@ functions: cd ./clusters/${cluster}/reports # move additional file here cp ../ips.sh . + cp ../ips.py . cp ../../perf_all.json . cd .. ../../bin/retrieve-diag-data.sh diff --git a/etc/system_perf.yml b/etc/system_perf.yml index f6b0cd53e0b..7cd91399ecb 100644 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -68,7 +68,7 @@ functions: # create all resources and instances ../../bin/setup-cluster.sh ${cluster} echo "EC2 Cluster CREATED." - tar -czvf cluster_config.tgz ips.sh terraform.tfstate.backup terraform.tfstate + tar -czvf cluster_config.tgz ips.sh ips.py terraform.tfstate cluster.tf terraform.tfvars variables.tf - command: s3.put params: aws_key: ${aws_key} @@ -106,8 +106,9 @@ functions: script: | set -e set -o verbose + source ./venv/bin/activate cd ./clusters/${cluster} - ../../bin/configure-mongodb-cluster.sh ${setup} ${storageEngine} + ../../bin/mongodb_setup.py ${setup} ${storageEngine} echo "${cluster} MongoDB Cluster STARTED." "run test": - command: shell.exec @@ -160,6 +161,7 @@ functions: cd ./clusters/${cluster}/reports # move additional file here cp ../ips.sh . + cp ../ips.py . if [ -f "../terraform.log" ]; then cp ../terraform.log .; fi cp ../../perf.json . cd .. |