summaryrefslogtreecommitdiff
path: root/test/lib/ansible_test/_internal/core_ci.py
diff options
context:
space:
mode:
authorYanis Guenane <yguenane@redhat.com>2020-01-30 00:56:51 +0100
committerGitHub <noreply@github.com>2020-01-29 15:56:51 -0800
commit4fd2dce7f3227e36a84890b2b5b8269312db7d63 (patch)
tree3c3006ec05cde5eb6d238d2782907154cd5a3561 /test/lib/ansible_test/_internal/core_ci.py
parenteec6afd1162b5c3ab14df4f1478d9d8eb8a01959 (diff)
downloadansible-4fd2dce7f3227e36a84890b2b5b8269312db7d63.tar.gz
Testing: Add support for AIX platform (#65802)
Diffstat (limited to 'test/lib/ansible_test/_internal/core_ci.py')
-rw-r--r--test/lib/ansible_test/_internal/core_ci.py16
1 files changed, 13 insertions, 3 deletions
diff --git a/test/lib/ansible_test/_internal/core_ci.py b/test/lib/ansible_test/_internal/core_ci.py
index 0cc821912a..163931ce69 100644
--- a/test/lib/ansible_test/_internal/core_ci.py
+++ b/test/lib/ansible_test/_internal/core_ci.py
@@ -68,6 +68,7 @@ class AnsibleCoreCI:
self.instance_id = None
self.endpoint = None
self.max_threshold = 1
+ self.retries = 3
self.name = name if name else '%s-%s' % (self.platform, self.version)
self.ci_key = os.path.expanduser('~/.ansible-core-ci.key')
self.resource = 'jobs'
@@ -89,6 +90,10 @@ class AnsibleCoreCI:
azure=(
'azure',
),
+ ibmcloud=(
+ 'aix',
+ 'ibmi',
+ ),
parallels=(
'osx',
),
@@ -114,7 +119,7 @@ class AnsibleCoreCI:
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 in ('aws', 'azure', 'ibmcloud'):
if self.provider != 'aws':
self.resource = self.provider
@@ -141,6 +146,12 @@ class AnsibleCoreCI:
self.port = 5986
else:
self.port = 22
+
+ if self.provider == 'ibmcloud':
+ # Additional retries are neededed to accommodate images transitioning
+ # to the active state in the IBM cloud. This operation can take up to
+ # 90 seconds
+ self.retries = 7
elif self.provider == 'parallels':
self.endpoints = self._get_parallels_endpoints()
self.max_threshold = 6
@@ -151,7 +162,6 @@ class AnsibleCoreCI:
self.ssh_key = SshKey(args)
self.endpoints = ['https://access.ws.testing.ansible.com']
self.max_threshold = 1
-
else:
raise ApplicationError('Unsupported platform: %s' % platform)
@@ -423,7 +433,7 @@ class AnsibleCoreCI:
:type threshold: int
:rtype: HttpResponse | None
"""
- tries = 3
+ tries = self.retries
sleep = 15
data['threshold'] = threshold