diff --git a/bin/provision_test_vms.sh b/bin/provision_test_vms.sh index b42a32cd..740ef63c 100755 --- a/bin/provision_test_vms.sh +++ b/bin/provision_test_vms.sh @@ -10,7 +10,7 @@ function signal_failure() { trap signal_failure ERR function install_terraform() { - curl -fsS https://releases.hashicorp.com/terraform/0.8.5/terraform_0.8.5_linux_amd64.zip | gunzip >terraform && chmod +x terraform && sudo mv terraform /usr/bin + curl -fsS https://releases.hashicorp.com/terraform/0.11.14/terraform_0.11.14_linux_amd64.zip | gunzip >terraform && chmod +x terraform && sudo mv terraform /usr/bin } function install_ansible() { diff --git a/test/run-integration-tests.sh b/test/run-integration-tests.sh index 546ea081..0c49b8bd 100755 --- a/test/run-integration-tests.sh +++ b/test/run-integration-tests.sh @@ -206,7 +206,8 @@ function set_hosts() { function provision_remotely() { case "$1" in on) - terraform apply -input=false -parallelism="$NUM_HOSTS" -var "app=$APP" -var "name=$NAME" -var "num_hosts=$NUM_HOSTS" "$DIR/../tools/provisioning/$2" + terraform init "$DIR/../tools/provisioning/gcp" + terraform apply -auto-approve -input=false -parallelism="$NUM_HOSTS" -var "app=$APP" -var "name=$NAME" -var "num_hosts=$NUM_HOSTS" "$DIR/../tools/provisioning/$2" local status=$? ssh_user=$(terraform output username) ssh_id_file=$(terraform output private_key_path) diff --git a/tools b/tools index f041a74f..2a2df527 160000 --- a/tools +++ b/tools @@ -1 +1 @@ -Subproject commit f041a74ffbf273b627d6c960f17357108d0dbd1c +Subproject commit 2a2df527894bcaa5d42ad80654c43e1e5a6b03d7