Multiple Parallels host support for ansible-test. (#31552)
This commit is contained in:
parent
03e18aa52e
commit
05ec376197
1 changed files with 122 additions and 25 deletions
|
@ -51,6 +51,8 @@ class AnsibleCoreCI(object):
|
||||||
self.client = HttpClient(args)
|
self.client = HttpClient(args)
|
||||||
self.connection = None
|
self.connection = None
|
||||||
self.instance_id = None
|
self.instance_id = None
|
||||||
|
self.endpoint = None
|
||||||
|
self.max_threshold = 1
|
||||||
self.name = name if name else '%s-%s' % (self.platform, self.version)
|
self.name = name if name else '%s-%s' % (self.platform, self.version)
|
||||||
self.ci_key = os.path.expanduser('~/.ansible-core-ci.key')
|
self.ci_key = os.path.expanduser('~/.ansible-core-ci.key')
|
||||||
|
|
||||||
|
@ -85,7 +87,7 @@ class AnsibleCoreCI(object):
|
||||||
# send all non-Shippable jobs to us-east-1 to reduce api key maintenance
|
# send all non-Shippable jobs to us-east-1 to reduce api key maintenance
|
||||||
region = 'us-east-1'
|
region = 'us-east-1'
|
||||||
|
|
||||||
self.endpoint = AWS_ENDPOINTS[region]
|
self.endpoints = AWS_ENDPOINTS[region],
|
||||||
|
|
||||||
if self.platform == 'windows':
|
if self.platform == 'windows':
|
||||||
self.ssh_key = None
|
self.ssh_key = None
|
||||||
|
@ -94,7 +96,8 @@ class AnsibleCoreCI(object):
|
||||||
self.ssh_key = SshKey(args)
|
self.ssh_key = SshKey(args)
|
||||||
self.port = 22
|
self.port = 22
|
||||||
elif self.platform in osx_platforms:
|
elif self.platform in osx_platforms:
|
||||||
self.endpoint = 'https://osx.testing.ansible.com'
|
self.endpoints = self._get_parallels_endpoints()
|
||||||
|
self.max_threshold = 6
|
||||||
|
|
||||||
self.ssh_key = SshKey(args)
|
self.ssh_key = SshKey(args)
|
||||||
self.port = None
|
self.port = None
|
||||||
|
@ -121,8 +124,10 @@ class AnsibleCoreCI(object):
|
||||||
verbosity=1)
|
verbosity=1)
|
||||||
|
|
||||||
self.instance_id = None
|
self.instance_id = None
|
||||||
|
self.endpoint = None
|
||||||
else:
|
else:
|
||||||
self.instance_id = None
|
self.instance_id = None
|
||||||
|
self.endpoint = None
|
||||||
self._clear()
|
self._clear()
|
||||||
|
|
||||||
if self.instance_id:
|
if self.instance_id:
|
||||||
|
@ -130,6 +135,28 @@ class AnsibleCoreCI(object):
|
||||||
else:
|
else:
|
||||||
self.started = False
|
self.started = False
|
||||||
self.instance_id = str(uuid.uuid4())
|
self.instance_id = str(uuid.uuid4())
|
||||||
|
self.endpoint = None
|
||||||
|
|
||||||
|
def _get_parallels_endpoints(self):
|
||||||
|
"""
|
||||||
|
:rtype: tuple[str]
|
||||||
|
"""
|
||||||
|
client = HttpClient(self.args, always=True)
|
||||||
|
display.info('Getting available endpoints...', verbosity=1)
|
||||||
|
sleep = 3
|
||||||
|
|
||||||
|
for _ in range(1, 10):
|
||||||
|
response = client.get('https://s3.amazonaws.com/ansible-ci-files/ansible-test/parallels-endpoints.txt')
|
||||||
|
|
||||||
|
if response.status_code == 200:
|
||||||
|
endpoints = tuple(response.response.splitlines())
|
||||||
|
display.info('Available endpoints (%d):\n%s' % (len(endpoints), '\n'.join(' - %s' % endpoint for endpoint in endpoints)), verbosity=1)
|
||||||
|
return endpoints
|
||||||
|
|
||||||
|
display.warning('HTTP %d error getting endpoints, trying again in %d seconds.' % (response.status_code, sleep))
|
||||||
|
time.sleep(sleep)
|
||||||
|
|
||||||
|
raise ApplicationError('Unable to get available endpoints.')
|
||||||
|
|
||||||
def start(self):
|
def start(self):
|
||||||
"""Start instance."""
|
"""Start instance."""
|
||||||
|
@ -291,23 +318,7 @@ class AnsibleCoreCI(object):
|
||||||
'Content-Type': 'application/json',
|
'Content-Type': 'application/json',
|
||||||
}
|
}
|
||||||
|
|
||||||
tries = 3
|
response = self._start_try_endpoints(data, headers)
|
||||||
sleep = 15
|
|
||||||
|
|
||||||
while True:
|
|
||||||
tries -= 1
|
|
||||||
response = self.client.put(self._uri, data=json.dumps(data), headers=headers)
|
|
||||||
|
|
||||||
if response.status_code == 200:
|
|
||||||
break
|
|
||||||
|
|
||||||
error = self._create_http_error(response)
|
|
||||||
|
|
||||||
if not tries:
|
|
||||||
raise error
|
|
||||||
|
|
||||||
display.warning('%s. Trying again after %d seconds.' % (error, sleep))
|
|
||||||
time.sleep(sleep)
|
|
||||||
|
|
||||||
self.started = True
|
self.started = True
|
||||||
self._save()
|
self._save()
|
||||||
|
@ -319,6 +330,64 @@ class AnsibleCoreCI(object):
|
||||||
|
|
||||||
return response.json()
|
return response.json()
|
||||||
|
|
||||||
|
def _start_try_endpoints(self, data, headers):
|
||||||
|
"""
|
||||||
|
:type data: dict[str, any]
|
||||||
|
:type headers: dict[str, str]
|
||||||
|
:rtype: HttpResponse
|
||||||
|
"""
|
||||||
|
threshold = 1
|
||||||
|
|
||||||
|
while threshold <= self.max_threshold:
|
||||||
|
for self.endpoint in self.endpoints:
|
||||||
|
try:
|
||||||
|
return self._start_at_threshold(data, headers, threshold)
|
||||||
|
except CoreHttpError as ex:
|
||||||
|
if ex.status == 503:
|
||||||
|
display.info('Service Unavailable: %s' % ex.remote_message, verbosity=1)
|
||||||
|
continue
|
||||||
|
display.error(ex.remote_message)
|
||||||
|
except HttpError as ex:
|
||||||
|
display.error(u'%s' % ex)
|
||||||
|
|
||||||
|
time.sleep(3)
|
||||||
|
|
||||||
|
threshold += 1
|
||||||
|
|
||||||
|
raise ApplicationError('Maximum threshold reached and all endpoints exhausted.')
|
||||||
|
|
||||||
|
def _start_at_threshold(self, data, headers, threshold):
|
||||||
|
"""
|
||||||
|
:type data: dict[str, any]
|
||||||
|
:type headers: dict[str, str]
|
||||||
|
:type threshold: int
|
||||||
|
:rtype: HttpResponse | None
|
||||||
|
"""
|
||||||
|
tries = 3
|
||||||
|
sleep = 15
|
||||||
|
|
||||||
|
data['threshold'] = threshold
|
||||||
|
|
||||||
|
display.info('Trying endpoint: %s (threshold %d)' % (self.endpoint, threshold), verbosity=1)
|
||||||
|
|
||||||
|
while True:
|
||||||
|
tries -= 1
|
||||||
|
response = self.client.put(self._uri, data=json.dumps(data), headers=headers)
|
||||||
|
|
||||||
|
if response.status_code == 200:
|
||||||
|
return response
|
||||||
|
|
||||||
|
error = self._create_http_error(response)
|
||||||
|
|
||||||
|
if response.status_code == 503:
|
||||||
|
raise error
|
||||||
|
|
||||||
|
if not tries:
|
||||||
|
raise error
|
||||||
|
|
||||||
|
display.warning('%s. Trying again after %d seconds.' % (error, sleep))
|
||||||
|
time.sleep(sleep)
|
||||||
|
|
||||||
def _clear(self):
|
def _clear(self):
|
||||||
"""Clear instance information."""
|
"""Clear instance information."""
|
||||||
try:
|
try:
|
||||||
|
@ -332,14 +401,23 @@ class AnsibleCoreCI(object):
|
||||||
"""Load instance information."""
|
"""Load instance information."""
|
||||||
try:
|
try:
|
||||||
with open(self.path, 'r') as instance_fd:
|
with open(self.path, 'r') as instance_fd:
|
||||||
self.instance_id = instance_fd.read()
|
data = instance_fd.read()
|
||||||
self.started = True
|
|
||||||
except IOError as ex:
|
except IOError as ex:
|
||||||
if ex.errno != errno.ENOENT:
|
if ex.errno != errno.ENOENT:
|
||||||
raise
|
raise
|
||||||
self.instance_id = None
|
|
||||||
|
|
||||||
return self.instance_id
|
return False
|
||||||
|
|
||||||
|
if not data.startswith('{'):
|
||||||
|
return False # legacy format
|
||||||
|
|
||||||
|
config = json.loads(data)
|
||||||
|
|
||||||
|
self.instance_id = config['instance_id']
|
||||||
|
self.endpoint = config['endpoint']
|
||||||
|
self.started = True
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
def _save(self):
|
def _save(self):
|
||||||
"""Save instance information."""
|
"""Save instance information."""
|
||||||
|
@ -349,7 +427,12 @@ class AnsibleCoreCI(object):
|
||||||
make_dirs(os.path.dirname(self.path))
|
make_dirs(os.path.dirname(self.path))
|
||||||
|
|
||||||
with open(self.path, 'w') as instance_fd:
|
with open(self.path, 'w') as instance_fd:
|
||||||
instance_fd.write(self.instance_id)
|
config = dict(
|
||||||
|
instance_id=self.instance_id,
|
||||||
|
endpoint=self.endpoint,
|
||||||
|
)
|
||||||
|
|
||||||
|
instance_fd.write(json.dumps(config, indent=4, sort_keys=True))
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _create_http_error(response):
|
def _create_http_error(response):
|
||||||
|
@ -370,7 +453,21 @@ class AnsibleCoreCI(object):
|
||||||
else:
|
else:
|
||||||
message = str(response_json)
|
message = str(response_json)
|
||||||
|
|
||||||
return HttpError(response.status_code, '%s%s' % (message, stack_trace))
|
return CoreHttpError(response.status_code, message, stack_trace)
|
||||||
|
|
||||||
|
|
||||||
|
class CoreHttpError(HttpError):
|
||||||
|
"""HTTP response as an error."""
|
||||||
|
def __init__(self, status, remote_message, remote_stack_trace):
|
||||||
|
"""
|
||||||
|
:type status: int
|
||||||
|
:type remote_message: str
|
||||||
|
:type remote_stack_trace: str
|
||||||
|
"""
|
||||||
|
super(CoreHttpError, self).__init__(status, '%s%s' % (remote_message, remote_stack_trace))
|
||||||
|
|
||||||
|
self.remote_message = remote_message
|
||||||
|
self.remote_stack_trace = remote_stack_trace
|
||||||
|
|
||||||
|
|
||||||
class SshKey(object):
|
class SshKey(object):
|
||||||
|
|
Loading…
Reference in a new issue