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:03:41 +0300 |
| commit | 5260294d8a1df03eefa71570f0c426f2c186a6a7 (patch) | |
| tree | 18f8e175d1d75f56554b727b5fa02cc8439b64d6 | |
| parent | 58a490d466b31f70384b7173aa50fb32ac487563 (diff) | |
| download | mongo-5260294d8a1df03eefa71570f0c426f2c186a6a7.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
| -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 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 .. |