summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/distributed_correctness.yml6
-rw-r--r--etc/longevity.yml7
-rw-r--r--etc/system_perf.yml6
3 files changed, 9 insertions, 10 deletions
diff --git a/etc/distributed_correctness.yml b/etc/distributed_correctness.yml
index b2502e6504e..207fb193f4a 100644
--- a/etc/distributed_correctness.yml
+++ b/etc/distributed_correctness.yml
@@ -60,10 +60,10 @@ functions:
# to create a mongod EC2 cluster
set -e
set -v
- cd ./clusters/${cluster}
# create all resources and instances
- ./setup-cluster.sh
+ bin/setup-cluster.sh ${cluster}
echo "EC2 Cluster CREATED."
+ cd ./clusters/${cluster}
touch terraform.tfstate.backup
tar -czvf cluster_config.tgz ips.sh terraform.tfstate.backup terraform.tfstate
- command: s3.put
@@ -122,7 +122,7 @@ functions:
rm -f ../../reports.tgz
echo "Run test for ${test} with setup ${setup}"
# run test
- ./run-${test}.sh ${storageEngine} ${setup}
+ ../../bin/run-${test}.sh ${storageEngine} ${setup} ${cluster}
rm -f ../perf.json
chmod 766 perf.json
cp ./perf.json ..
diff --git a/etc/longevity.yml b/etc/longevity.yml
index 6fa8cd8eda5..5fb81c9ea43 100644
--- a/etc/longevity.yml
+++ b/etc/longevity.yml
@@ -62,8 +62,7 @@ functions:
# to create a mongod EC2 cluster
set -e
set -o verbose
- cd ./clusters/${cluster}
- ./setup-cluster.sh
+ bin/setup-cluster.sh ${cluster}
echo "EC2 Cluster CREATED."
"configure mongodb cluster":
@@ -97,7 +96,7 @@ functions:
rm -f ../../reports.tgz
echo "Run test for ${test} with setup ${setup}"
# run test
- ./run-${test}.sh
+ ../../bin/run-${test}.sh ${storageEngine} ${setup} ${cluster}
mv perf.json ..
cd ..
cat perf.json >> perf_all.json
@@ -253,7 +252,7 @@ tasks:
use_csrs: "true"
- func: "run test"
vars:
- test: "ycsb-CSRS-wiredTiger"
+ test: "ycsb-csrs"
- func: "make test log artifact"
- func: "upload log file"
vars:
diff --git a/etc/system_perf.yml b/etc/system_perf.yml
index fa9ee577559..3a76569b973 100644
--- a/etc/system_perf.yml
+++ b/etc/system_perf.yml
@@ -60,10 +60,10 @@ functions:
# to create a mongod EC2 cluster
set -e
set -o verbose
- cd ./clusters/${cluster}
# create all resources and instances
- ./setup-cluster.sh
+ bin/setup-cluster.sh ${cluster}
echo "EC2 Cluster CREATED."
+ cd ./clusters/${cluster}
tar -czvf cluster_config.tgz ips.sh terraform.tfstate.backup terraform.tfstate cluster.tf terraform.tfvars variables.tf
- command: s3.put
params:
@@ -122,7 +122,7 @@ functions:
rm -f ../../reports.tgz
echo "Run test for ${test} with setup ${setup}"
# run test
- ./run-${test}.sh ${storageEngine} ${setup}
+ ../../bin/run-${test}.sh ${storageEngine} ${setup} ${cluster}
rm -f ../perf.json
chmod 766 perf.json
cp ./perf.json ..