cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

append AWS region to test instance file (#45877)

Browse source
This commit is contained in:
Jordan Borean 2018-09-20 10:56:56 +10:00 committed by GitHub
parent 197ddd3c45
commit 582a4dfa13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
test/runner/lib/core_ci.py
View file

@ -95,6 +95,8 @@ class AnsibleCoreCI(object):
self.provider = candidate
break
self.path = os.path.expanduser('~/.ansible/test/instances/%s-%s-%s' % (self.name, self.provider, self.stage))
if self.provider in ('aws', 'azure'):
if self.provider != 'aws':
self.resource = self.provider
@ -114,6 +116,7 @@ class AnsibleCoreCI(object):
# send all non-Shippable jobs to us-east-1 to reduce api key maintenance
region = 'us-east-1'
self.path = "%s-%s" % (self.path, region)
self.endpoints = AWS_ENDPOINTS[region],
self.ssh_key = SshKey(args)
@ -130,8 +133,6 @@ class AnsibleCoreCI(object):
else:
raise ApplicationError('Unsupported platform: %s' % platform)
self.path = os.path.expanduser('~/.ansible/test/instances/%s-%s-%s' % (self.name, self.provider, self.stage))
if persist and load and self._load():
try:
display.info('Checking existing %s/%s instance %s.' % (self.platform, self.version, self.instance_id),