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

Update ansible-test change handling and CS plugin. (#24395)

Browse source 
* Use CloudStack simulator from Ansible repo.
* Recognize cloud specific ansible-test changes.
* Hide ansible-test cs notice in explain mode.
This commit is contained in:
Matt Clay 2017-05-09 16:15:27 +08:00 committed by GitHub
parent aaf4f04574
commit e6934e42be
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
test/runner/lib/classification.py
View file

@ -378,6 +378,16 @@ class PathMapper(object):
test_path = os.path.dirname(test_path) test_path = os.path.dirname(test_path)
if path.startswith('test/runner/lib/cloud/'):
cloud_target = 'cloud/%s/' % name
if cloud_target in self.integration_targets_by_alias:
return {
'integration': cloud_target,
}
return all_tests() # test infrastructure, run all tests
if path.startswith('test/runner/'): if path.startswith('test/runner/'):
return all_tests() # test infrastructure, run all tests return all_tests() # test infrastructure, run all tests

3
test/runner/lib/cloud/cs.py
View file

@ -51,7 +51,7 @@ class CsCloudProvider(CloudProvider):
""" """
super(CsCloudProvider, self).__init__(args, config_extension='.ini') super(CsCloudProvider, self).__init__(args, config_extension='.ini')
self.image = 'resmo/cloudstack-sim' self.image = 'ansible/ansible:cloudstack-simulator'
self.container_name = '' self.container_name = ''
self.endpoint = '' self.endpoint = ''
self.host = '' self.host = ''
@ -154,6 +154,7 @@ class CsCloudProvider(CloudProvider):
display.info('Starting a new CloudStack simulator docker container.', verbosity=1) display.info('Starting a new CloudStack simulator docker container.', verbosity=1)
docker_pull(self.args, self.image) docker_pull(self.args, self.image)
docker_run(self.args, self.image, ['-d', '-p', '8888:8888', '--name', self.container_name]) docker_run(self.args, self.image, ['-d', '-p', '8888:8888', '--name', self.container_name])
if not self.args.explain:
display.notice('The CloudStack simulator will probably be ready in 5 - 10 minutes.') display.notice('The CloudStack simulator will probably be ready in 5 - 10 minutes.')
container_id = get_docker_container_id() container_id = get_docker_container_id()