Differential D492

report_job_results: handle cancelled jobs
ClosedPublic
Actions

Authored by adamwill on Aug 7 2015, 9:19 PM.

Details

Reviewers
garretraziel
jskladan
Commits
rOPENQAf4738942187d: report_job_results: handle cancelled jobs
Summary

Cancelled jobs have their own state (at least in the openQA
running on happyassassin, they do). This causes r_j_r to get
stuck forever if any of the jobs are cancelled. Consider a
cancelled job 'done'.

Test Plan

Try submitting results for a set of jobs that includes one or
more cancelled jobs. It should now work (before it would get
stuck).

Diff Detail

Repository
rOPENQA fedora_openqa
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
adamwill retitled this revision from to report_job_results: handle cancelled jobs.Aug 7 2015, 9:19 PM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: jskladan, garretraziel.
garretraziel accepted this revision.Aug 10 2015, 9:08 AM

I am not sure, but I think that in older versions, cancelled jobs had job_state['state'] == 'done', but job_state['outcome'] == 'cancelled', but nvm, this will work either way.

This revision is now accepted and ready to land.Aug 10 2015, 9:08 AM
Closed by commit rOPENQAf4738942187d: report_job_results: handle cancelled jobs (authored by adamwill). · Explain WhyAug 10 2015, 6:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1301

View Options

tools/openqa_trigger/report_job_results.py

Show All 19 Lines15def get_passed_testcases(job_ids, client):
20 running_jobs = dict([(job_id, "jobs/%s" % job_id) for job_id in job_ids]) 20​ running_jobs = dict([(job_id, "jobs/%s" % job_id) for job_id in job_ids])
21 logger.info("running jobs: %s", running_jobs) 21​ logger.info("running jobs: %s", running_jobs)
22 finished_jobs = {} 22​ finished_jobs = {}
23 23​
24 while running_jobs: 24​ while running_jobs:
25 for job_id, url in running_jobs.items(): 25​ for job_id, url in running_jobs.items():
26 output = client.openqa_request('GET', url) 26​ output = client.openqa_request('GET', url)
27 job_state = output['job'] 27​ job_state = output['job']
28 if job_state['state'] == 'done': 28​ if job_state['state'] in ('done', 'cancelled'):
29 logger.info("job %s is done", job_id) 29​ logger.info("job %s is done", job_id)
30 finished_jobs[job_id] = job_state 30​ finished_jobs[job_id] = job_state
31 del running_jobs[job_id] 31​ del running_jobs[job_id]
32 if running_jobs: 32​ if running_jobs:
33 time.sleep(SLEEPTIME) 33​ time.sleep(SLEEPTIME)
34 logger.info("all jobs finished") 34​ logger.info("all jobs finished")
35 35​
36 passed_testcases = set() 36​ passed_testcases = set()
▲ Show 20 Lines • Show All 67 Lines • Show Last 20 Lines