sascha/workload-automation
1
0
Fork 0
mirror of https://github.com/ARM-software/workload-automation.git synced 2025-03-21 18:18:41 +00:00
Code Issues Releases Wiki Activity

framework/signals: Remove unnecessary job signals

Browse Source 
Remove overlap of signals between jobs and workload.
This commit is contained in:
Marc Bonnici 2018-05-30 11:53:22 +01:00 committed by setrofim
parent ceadb36880
commit 703e32e511
2 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wa/framework/execution.py
View File

@ -455,8 +455,7 @@ class Runner(object):
while self.context.job_queue: while self.context.job_queue:
if self.context.run_interrupted: if self.context.run_interrupted:
raise KeyboardInterrupt() raise KeyboardInterrupt()
with signal.wrap('JOB_EXECUTION', self, self.context): self.run_next_job(self.context)
self.run_next_job(self.context)
except KeyboardInterrupt as e: except KeyboardInterrupt as e:
log.log_error(e, self.logger) log.log_error(e, self.logger)
@ -551,8 +550,7 @@ class Runner(object):
job.configure_target(context) job.configure_target(context)
try: try:
with signal.wrap('JOB_SETUP', self, context): job.setup(context)
job.setup(context)
except Exception as e: except Exception as e:
job.set_status(Status.FAILED) job.set_status(Status.FAILED)
log.log_error(e, self.logger) log.log_error(e, self.logger)
@ -564,8 +562,7 @@ class Runner(object):
try: try:
try: try:
with signal.wrap('JOB_EXECUTION', self, context): job.run(context)
job.run(context)
except KeyboardInterrupt: except KeyboardInterrupt:
context.run_interrupted = True context.run_interrupted = True
job.set_status(Status.ABORTED) job.set_status(Status.ABORTED)
@ -597,8 +594,7 @@ class Runner(object):
finally: finally:
# If setup was successfully completed, teardown must # If setup was successfully completed, teardown must
# run even if the job failed # run even if the job failed
with signal.wrap('JOB_TEARDOWN', self): job.teardown(context)
job.teardown(context)
def check_job(self, job): def check_job(self, job):
rc = self.context.cm.run_config rc = self.context.cm.run_config

12
wa/framework/signal.py
View File

@ -151,23 +151,11 @@ BEFORE_JOB_TARGET_CONFIG = Signal('before-job-target-config', invert_priority=Tr
SUCCESSFUL_JOB_TARGET_CONFIG = Signal('successful-job-target-config') SUCCESSFUL_JOB_TARGET_CONFIG = Signal('successful-job-target-config')
AFTER_JOB_TARGET_CONFIG = Signal('after-job-target-config') AFTER_JOB_TARGET_CONFIG = Signal('after-job-target-config')
BEFORE_JOB_SETUP = Signal('before-job-setup', invert_priority=True)
SUCCESSFUL_JOB_SETUP = Signal('successful-job-setup')
AFTER_JOB_SETUP = Signal('after-job-setup')
BEFORE_JOB_EXECUTION = Signal('before-job-execution', invert_priority=True)
SUCCESSFUL_JOB_EXECUTION = Signal('successful-job-execution')
AFTER_JOB_EXECUTION = Signal('after-job-execution')
BEFORE_JOB_OUTPUT_PROCESSED = Signal('before-job-output-processed', BEFORE_JOB_OUTPUT_PROCESSED = Signal('before-job-output-processed',
invert_priority=True) invert_priority=True)
SUCCESSFUL_JOB_OUTPUT_PROCESSED = Signal('successful-job-output-processed') SUCCESSFUL_JOB_OUTPUT_PROCESSED = Signal('successful-job-output-processed')
AFTER_JOB_OUTPUT_PROCESSED = Signal('after-job-output-processed') AFTER_JOB_OUTPUT_PROCESSED = Signal('after-job-output-processed')
BEFORE_JOB_TEARDOWN = Signal('before-job-teardown', invert_priority=True)
SUCCESSFUL_JOB_TEARDOWN = Signal('successful-job-teardown')
AFTER_JOB_TEARDOWN = Signal('after-job-teardown')
BEFORE_FLASHING = Signal('before-flashing', invert_priority=True) BEFORE_FLASHING = Signal('before-flashing', invert_priority=True)
SUCCESSFUL_FLASHING = Signal('successful-flashing') SUCCESSFUL_FLASHING = Signal('successful-flashing')
AFTER_FLASHING = Signal('after-flashing') AFTER_FLASHING = Signal('after-flashing')