Merge pull request #12804 from chrismeyersfsu/fix-test_non_destructive_makefile

allow env variable override of creds file
9 years ago · 549bdb2503
parent 0bbe9d5bd0 1b2d17b844
commit 549bdb2503
1 changed files with 1 additions and 1 deletions
--- a/test/integration/Makefile
+++ b/test/integration/Makefile
@ -6,7 +6,7 @@ ifndef CLOUD_RESOURCE_PREFIX
 CLOUD_RESOURCE_PREFIX := $(shell python -c "import string,random; print('ansible-testing-' + ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(8)));")
 endif

-CREDENTIALS_FILE = credentials.yml
+CREDENTIALS_FILE ?= credentials.yml
 # If credentials.yml exists, use it
 ifneq ("$(wildcard $(CREDENTIALS_FILE))","")
 CREDENTIALS_ARG = -e @$(CREDENTIALS_FILE)