archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

allow env variable override of creds file

Browse Source 
This is important because there is an integration test, test_git, that
require an ssh key to clone a privileged github repo.
pull/12804/head
Chris Meyers 9 years ago
parent fed7cea795
commit 1b2d17b844
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
test/integration/Makefile
Unescape Escape 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 xrange(8));") CLOUD_RESOURCE_PREFIX := $(shell python -c "import string,random; print 'ansible-testing-' + ''.join(random.choice(string.ascii_letters + string.digits) for _ in xrange(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)

Write Preview
Loading…
Cancel
Save