Make terraform use a custom data dir per-test configuration and user id

MOZGIII · MOZGIII · commit c389c3dd469f · 2020-04-02T00:37:30.000+03:00
diff --git a/bin/test b/bin/test
@@ -195,7 +195,6 @@ prepare_ansible_extra_args_array true
 # Execute
 #
 
-export TF_IN_AUTOMATION=true
 cd "$TEST_CASE_DIR"
 
 #
@@ -207,6 +206,9 @@ if [ "$BOOTSTRAP" == 'true' ] && [ "$SKIP_TERRAFORM" != 'true' ]; then
 
   cd terraform
 
+  export TF_IN_AUTOMATION=true
+  export TF_DATA_DIR=".terraform/$TEST_CONFIGURATION/$TEST_USER_ID"
+
   terraform init \
     "${TERRAFORM_COMMON_EXTRA_ARGS[@]}" \
     -backend-config="bucket=vector-test-harness-state" \

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,6 @@ prepare_ansible_extra_args_array true`
`195`	`195`	`# Execute`
`196`	`196`	`#`
`197`	`197`
`198`		`-export TF_IN_AUTOMATION=true`
`199`	`198`	`cd "$TEST_CASE_DIR"`
`200`	`199`
`201`	`200`	`#`
`@@ -207,6 +206,9 @@ if [ "$BOOTSTRAP" == 'true' ] && [ "$SKIP_TERRAFORM" != 'true' ]; then`
`207`	`206`
`208`	`207`	`cd terraform`
`209`	`208`
	`209`	`+ export TF_IN_AUTOMATION=true`
	`210`	`+ export TF_DATA_DIR=".terraform/$TEST_CONFIGURATION/$TEST_USER_ID"`
	`211`	`+`
`210`	`212`	`terraform init \`
`211`	`213`	`"${TERRAFORM_COMMON_EXTRA_ARGS[@]}" \`
`212`	`214`	`-backend-config="bucket=vector-test-harness-state" \`