Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ crash.log
# Ignore any .tfvars files that are generated automatically for each Terraform run. Most
# .tfvars files are managed as part of configuration and so should be included in
# version control.
#
# example.tfvars
test/fixtures/shared/terraform.tfvars

**/*/terraform.tfvars

credentials.json

Expand Down
5 changes: 0 additions & 5 deletions test/fixtures/automatic_labelling/terraform.tfvars

This file was deleted.

4 changes: 2 additions & 2 deletions test/integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ if [ -z "${SERVICE_ACCOUNT_JSON}" ]; then
fi

export TF_VAR_project_id="${PROJECT_ID}"
export TF_VAR_region="${REGION:-us-east4}"
export TF_VAR_zone="${ZONE:-us-east4-a}"
export TF_VAR_region="${REGION:-us-east1}"
export TF_VAR_zone="${ZONE:-us-east1-b}"

DELETE_AT_EXIT="$(mktemp -d)"
finish() {
Expand Down