Merge "Add integration tests for transient clusters"

This commit is contained in:
Jenkins 2015-01-15 16:23:15 +00:00 committed by Gerrit Code Review
commit 32bd45b77d

View File

@ -46,7 +46,6 @@ class TransientGatingTest(edp.EDPTest):
'node_processes': ['namenode', 'resourcemanager', 'node_processes': ['namenode', 'resourcemanager',
'oozie', 'historyserver'], 'oozie', 'historyserver'],
'floating_ip_pool': self.floating_ip_pool, 'floating_ip_pool': self.floating_ip_pool,
'auto_security_group': True,
'count': 1 'count': 1
}, },
{ {
@ -54,7 +53,6 @@ class TransientGatingTest(edp.EDPTest):
'flavor_id': self.flavor_id, 'flavor_id': self.flavor_id,
'node_processes': ['datanode', 'nodemanager'], 'node_processes': ['datanode', 'nodemanager'],
'floating_ip_pool': self.floating_ip_pool, 'floating_ip_pool': self.floating_ip_pool,
'auto_security_group': True,
'count': 1 'count': 1
} }
], ],
@ -79,7 +77,11 @@ class TransientGatingTest(edp.EDPTest):
@b.errormsg("Failure while cluster creation: ") @b.errormsg("Failure while cluster creation: ")
def _create_cluster(self): def _create_cluster(self):
cluster_name = '%s-transient' % self.common_config.CLUSTER_NAME self.cluster_ids = []
for number_of_cluster in range(3):
cluster_name = '%s-%d-transient' % (
self.common_config.CLUSTER_NAME,
number_of_cluster+1)
cluster = { cluster = {
'name': cluster_name, 'name': cluster_name,
'plugin_config': self.plugin_config, 'plugin_config': self.plugin_config,
@ -88,18 +90,26 @@ class TransientGatingTest(edp.EDPTest):
'cluster_configs': {}, 'cluster_configs': {},
'is_transient': True 'is_transient': True
} }
cluster_id = self.create_cluster(**cluster)
self.addCleanup(self.delete_objects, cluster_id=cluster_id) self.cluster_ids.append(self.create_cluster(**cluster))
self.poll_cluster_state(cluster_id) self.addCleanup(self.delete_objects,
self.cluster_ids[number_of_cluster])
for number_of_cluster in range(3):
self.poll_cluster_state(self.cluster_ids[number_of_cluster])
@b.errormsg("Failure while transient cluster testing: ") @b.errormsg("Failure while transient cluster testing: ")
def _check_transient(self): def _check_transient(self):
pig_job_data = self.edp_info.read_pig_example_script() pig_job_data = self.edp_info.read_pig_example_script()
pig_lib_data = self.edp_info.read_pig_example_jar() pig_lib_data = self.edp_info.read_pig_example_jar()
job_id = self.edp_testing(job_type=utils_edp.JOB_TYPE_PIG, job_ids = []
for cluster_id in self.cluster_ids:
self.cluster_id = cluster_id
job_ids.append(self.edp_testing(
job_type=utils_edp.JOB_TYPE_PIG,
job_data_list=[{'pig': pig_job_data}], job_data_list=[{'pig': pig_job_data}],
lib_data_list=[{'jar': pig_lib_data}]) lib_data_list=[{'jar': pig_lib_data}]))
self.poll_jobs_status([job_id]) self.poll_jobs_status(job_ids)
# set timeout in seconds # set timeout in seconds
timeout = self.common_config.TRANSIENT_CLUSTER_TIMEOUT * 60 timeout = self.common_config.TRANSIENT_CLUSTER_TIMEOUT * 60