diff options
| author | dalyd <david.daly@mongodb.com> | 2017-02-21 16:22:57 -0500 |
|---|---|---|
| committer | dalyd <david.daly@mongodb.com> | 2017-02-21 16:53:50 -0500 |
| commit | 6a90820082605af2afec5b27d25ff4ea2790f54d (patch) | |
| tree | f0c7f71e17007e59f94e6af7979399910a501807 /etc | |
| parent | 95d4a0a472e436dad9380db917145f121d8c3720 (diff) | |
| download | mongo-6a90820082605af2afec5b27d25ff4ea2790f54d.tar.gz | |
SERVER-28067: Update sys-perf.yml to copy over cluster.json
(cherry picked from commit 499d5f22e2b08e66ae9d7f60f5ecc13088d06082)
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/longevity.yml | 8 | ||||
| -rw-r--r-- | etc/system_perf.yml | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/etc/longevity.yml b/etc/longevity.yml index 1f95d977455..3721431bd36 100644 --- a/etc/longevity.yml +++ b/etc/longevity.yml @@ -43,8 +43,8 @@ post: set -e set -o verbose # call terraform destroy twice to avoid AWS timeout - yes yes | ./terraform destroy - yes yes | ./terraform destroy + yes yes | ./terraform destroy --var-file=cluster.json + yes yes | ./terraform destroy --var-file=cluster.json # clean all file to be safe rm -rf * echo "Cluster DESTROYED." @@ -208,8 +208,8 @@ functions: set -o verbose source ./dsienv.sh # destroy the EC2 cluster - yes yes | ./terraform destroy - yes yes | ./terraform destroy + yes yes | ./terraform destroy --var-file=cluster.json + yes yes | ./terraform destroy --var-file=cluster.json echo "Cluster DESTROYED." echo "All perf results" cd .. diff --git a/etc/system_perf.yml b/etc/system_perf.yml index da1c8082008..291f04f9704 100644 --- a/etc/system_perf.yml +++ b/etc/system_perf.yml @@ -227,7 +227,7 @@ functions: if [ $? -eq 0 ]; then echo "Resource provisioned/updated." # copy terraform information needed for teardown - cp {terraform.tfstate,cluster.tf,terraform.tfvars,security.tf} /data/infrastructure_provisioning/terraform/. + cp {terraform.tfstate,cluster.tf,terraform.tfvars,security.tf,cluster.json} /data/infrastructure_provisioning/terraform/. rsync -vr ../modules /data/infrastructure_provisioning/modules cd /data/infrastructure_provisioning/terraform ./terraform get @@ -238,8 +238,8 @@ functions: echo "Provisioning state updated on Evergreen host." else echo "Failed to provision resources. Cleaning up partial state." - yes yes | ./terraform destroy - if [ $? != 0 ]; then yes yes | ./terraform destroy; fi + cp src/dsi/dsi/bin/destroy_cluster.sh . + ./destroy_cluster.sh echo "Resource released." rm -r /data/infrastructure_provisioning echo "Cleaned up provisioning state on Evergreen host. Exiting test." |