internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 14:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12804 from chrismeyersfsu/fix-test_non_destructive_makefile

Browse Source 
allow env variable override of creds file
This commit is contained in:
James Cammarata
2015-10-18 10:18:22 -04:00
parent 0bbe9d5bd0 1b2d17b844
commit 549bdb2503
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/Makefile
View File

@@ -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)));") 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 endif
CREDENTIALS_FILE = credentials.yml CREDENTIALS_FILE ?= credentials.yml
# If credentials.yml exists, use it # If credentials.yml exists, use it
ifneq ("$(wildcard $(CREDENTIALS_FILE))","") ifneq ("$(wildcard $(CREDENTIALS_FILE))","")
CREDENTIALS_ARG = -e @$(CREDENTIALS_FILE) CREDENTIALS_ARG = -e @$(CREDENTIALS_FILE)