diff options
| author | Rui Zhang <rui.zhang@mongodb.com> | 2016-03-31 10:12:14 -0700 |
|---|---|---|
| committer | Rui Zhang <rui.zhang@mongodb.com> | 2016-03-31 10:12:14 -0700 |
| commit | 5a5f124bac4dc8ea31437ab084f17f48d2920939 (patch) | |
| tree | 1b9ced20b8ca03dda09b3abcdcc5fc797df3896b | |
| parent | a17c8d9b912965a11b9291b21a1b9e417893de33 (diff) | |
| download | mongo-5a5f124bac4dc8ea31437ab084f17f48d2920939.tar.gz | |
SERVER-23451 sys-perf should not fail during resource cleanup
| -rw-r--r-- | etc/system_perf.yml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/etc/system_perf.yml b/etc/system_perf.yml index 3a76569b973..f78a8280636 100644 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -17,8 +17,11 @@ post: set -e set -o verbose cd ./clusters/${cluster} - if [ ! -f "test.success" ]; then yes yes | ./terraform destroy; fi - if [ ! -f "test.success" ]; then echo "Cluster DESTROYED."; fi + if [ ! -f "test.success" ]; then + yes yes | ./terraform destroy + if [ $? != 0 ]; then yes yes | ./terraform destroy; fi + echo "Cluster DESTROYED." + fi functions: "prepare environment": @@ -105,7 +108,7 @@ functions: cd ./clusters/${cluster} # configure mongodb cluster with wiredTiger ../../bin/config-${setup}.sh mongodb ${storageEngine} ${numShard} ${test} - echo "${cluster} MongoDB Replica Cluster STARTED." + echo "${cluster} MongoDB Cluster STARTED." "run test": - command: shell.exec params: @@ -153,12 +156,10 @@ functions: set -o verbose cd ./clusters/${cluster} # destroy the EC2 cluster - yes yes | ./terraform destroy + yes yes | ./terraform destroy; true # make sure we destroy the cluster in case of AWS API timing issue - yes yes | ./terraform destroy + yes yes | ./terraform destroy; true echo "Cluster DESTROYED." - echo "All perf results" - cd .. "make test log artifact": - command: shell.exec |