diff options
| author | Henrik Ingo <henrik.ingo@10gen.com> | 2016-03-18 15:27:05 +0200 |
|---|---|---|
| committer | Henrik Ingo <henrik.ingo@10gen.com> | 2016-03-30 12:42:29 +0300 |
| commit | 5fe17eb83053b4d73adf2c099f5ecac59655e43c (patch) | |
| tree | 08235f00272576d0f52d30344e6c2333b564e846 /etc | |
| parent | bc59fbb5a6aa562c010eff525bd3a0b905392d97 (diff) | |
| download | mongo-5fe17eb83053b4d73adf2c099f5ecac59655e43c.tar.gz | |
SERVER-23387 Part 1: Moved dsi .sh files from clusters/ to bin/
Inside dsi scripts logic is still the same. Main change in
etc/*.yml is that ${cluster} (cluster type) is now a
parameter to setup-cluster.sh
(cherry picked from commit 5260294d8a1df03eefa71570f0c426f2c186a6a7)
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/distributed_correctness.yml | 6 | ||||
| -rw-r--r-- | etc/longevity.yml | 7 | ||||
| -rw-r--r-- | etc/system_perf.yml | 6 |
3 files changed, 9 insertions, 10 deletions
diff --git a/etc/distributed_correctness.yml b/etc/distributed_correctness.yml index a63a787ab60..c99623c6e5c 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 a42cb59dc55..177c8456af2 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 7b340ca3407..bb50a4a5c18 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 - 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 .. |