Check the return code for the test script.
Rework the error reporting from the dataset log analysis to take
into account global failures as well, and only report success if
both global success and dataset success have been achieved.
Fixes bug: 1263828
Change-Id: I53aa5ab949293a02f93f9981c0f98246a77d825f
diff --git a/turbo_hipster/lib/utils.py b/turbo_hipster/lib/utils.py
index 0555ca7..3739b44 100644
--- a/turbo_hipster/lib/utils.py
+++ b/turbo_hipster/lib/utils.py
@@ -184,6 +184,7 @@
logger.removeHandler(log_handler)
log_handler.flush()
log_handler.close()
+ return p.returncode
def push_file(job_log_dir, file_path, publish_config):
diff --git a/turbo_hipster/task_plugins/gate_real_db_upgrade/task.py b/turbo_hipster/task_plugins/gate_real_db_upgrade/task.py
index f55f5f6..48efb2c 100644
--- a/turbo_hipster/task_plugins/gate_real_db_upgrade/task.py
+++ b/turbo_hipster/task_plugins/gate_real_db_upgrade/task.py
@@ -66,6 +66,9 @@
def start_job(self, job):
self.job = job
+ self.success = True
+ self.messages = []
+
if self.job is not None:
try:
self.job_arguments = \
@@ -88,7 +91,10 @@
# Step 3: Run migrations on datasets
self._do_next_step()
- self._execute_migrations()
+ if self._execute_migrations() > 0:
+ self.success = False
+ self.messages.append('Return code from test script was '
+ 'non-zero')
# Step 4: Analyse logs for errors
self._do_next_step()
@@ -123,22 +129,30 @@
def _check_all_dataset_logs_for_errors(self):
self.log.debug("Check logs for errors")
- success = True
- messages = []
for i, dataset in enumerate(self.job_datasets):
# Look for the beginning of the migration start
dataset_success, message = \
handle_results.check_log_for_errors(
dataset['job_log_file_path'], self.git_path,
dataset['config'])
- self.job_datasets[i]['result'] = message
- messages.append(message)
- success = False if not dataset_success else success
- if success:
+ if self.success:
+ if dataset_success:
+ self.job_datasets[i]['result'] = 'SUCCESS'
+ else:
+ self.success = False
+ self.job_datasets[i]['result'] = message
+ self.messages.append(message)
+
+ else:
+ self.job_datasets[i]['result'] = self.messages[0]
+ if not dataset_success:
+ self.messages.append(message)
+
+ if self.success:
self.work_data['result'] = "SUCCESS"
else:
- self.work_data['result'] = "\n".join(messages)
+ self.work_data['result'] = "\n".join(self.messages)
def _get_datasets(self):
self.log.debug("Get configured datasets to run tests against")
@@ -255,7 +269,7 @@
if 'sqlerr' in self.global_config['logs']:
sqlerr = self.global_config['logs']['sqlerr']
- utils.execute_to_log(
+ rc = utils.execute_to_log(
cmd,
dataset['job_log_file_path'],
watch_logs=[
@@ -264,6 +278,7 @@
('[sqlerr]', sqlerr)
],
)
+ return rc
def _grab_patchset(self, project_name, zuul_ref):
""" Checkout the reference into config['git_working_dir'] """