Differential D493

print job ID lists with just space separators
ClosedPublic
Actions

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

Details

Reviewers
garretraziel
jskladan
Commits
rOPENQAb3edd65a233b: print job ID lists with just space separators
Summary

This way you can just copy/paste the damn list for report_job_
results instead of reformatting it, if you want to feed it in
manually for any reason.

Test Plan

Run some commands that schedule jobs and make sure they're
printed as '1 2 3' not '[1, 2, 3]'

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 print job ID lists with just space separators.Aug 7 2015, 9:34 PM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: jskladan, garretraziel.
This revision is now accepted and ready to land.Aug 10 2015, 9:26 AM
Closed by commit rOPENQAb3edd65a233b: print job ID lists with just space separators (authored by adamwill). · Explain WhyAug 10 2015, 6:11 PM
This revision was automatically updated to reflect the committed changes.
adamwill added a comment.Aug 10 2015, 6:16 PM

Sorry - as landed this didn't work, I forgot I had found that out and fixed it later without updating the commit. The job IDs are ints, so they need converting to strs before logging. I sent a follow-up commit to fix the problem: https://phab.qadevel.cloud.fedoraproject.org/rOPENQA521acb7dd68b

Revision Contents

Diff 1302

View Options

tools/openqa_trigger/openqa_trigger.py

Show First 20 Lines • Show All 114 Lines • ▼ Show 20 Line(s)114 else:
115 runarches.append(arch) 115​ runarches.append(arch)
116 logging.debug("%s will be tested in version %s", arch, currev.sortname) 116​ logging.debug("%s will be tested in version %s", arch, currev.sortname)
117 json_parsed[arch] = currev.sortname 117​ json_parsed[arch] = currev.sortname
118 118​
119 jobs = [] 119​ jobs = []
120 120​
121 try: 121​ try:
122 jobs = jobs_from_fedfind(currev.ff_release, client, runarches) 122​ jobs = jobs_from_fedfind(currev.ff_release, client, runarches)
123 logging.info("planned jobs: %s", jobs) 123​ logging.info("planned jobs: %s", ' '.join(jobs))
124 124​
125 # write info about latest versions 125​ # write info about latest versions
126 f = open(PERSISTENT, "w") 126​ f = open(PERSISTENT, "w")
127 f.write(json.dumps(json_parsed)) 127​ f.write(json.dumps(json_parsed))
128 f.close() 128​ f.close()
129 logging.debug("written info about newest version") 129​ logging.debug("written info about newest version")
130 except TriggerException as e: 130​ except TriggerException as e:
131 logging.error("cannot run jobs: %s", e) 131​ logging.error("cannot run jobs: %s", e)
▲ Show 20 Lines • Show All 75 Lines • ▼ Show 20 Line(s)
207def run_current(args, client, wiki): 207​def run_current(args, client, wiki):
208 """run OpenQA for current release validation event, if we have 208​ """run OpenQA for current release validation event, if we have
209 not already done it. 209​ not already done it.
210 """ 210​ """
211 logging.info("running on current release") 211​ logging.info("running on current release")
212 jobs, _ = jobs_from_current(wiki, client) 212​ jobs, _ = jobs_from_current(wiki, client)
213 # wait for jobs to finish and display results 213​ # wait for jobs to finish and display results
214 if jobs: 214​ if jobs:
215 logging.info("waiting for jobs: %s", jobs) 215​ logging.info("waiting for jobs: %s", ' '.join(jobs))
216 report_results(jobs, client) 216​ report_results(jobs, client)
217 logging.debug("finished") 217​ logging.debug("finished")
218 sys.exit() 218​ sys.exit()
219 219​
220 220​
221def run_compose(args, client, wiki=None): 221​def run_compose(args, client, wiki=None):
222 """run OpenQA on a specified compose, optionally reporting results 222​ """run OpenQA on a specified compose, optionally reporting results
223 if a matching wikitcms ValidationEvent is found by relval/wikitcms 223​ if a matching wikitcms ValidationEvent is found by relval/wikitcms
Show All 13 Lines
237 jobs = [] 237​ jobs = []
238 try: 238​ try:
239 if args.arch: 239​ if args.arch:
240 jobs = jobs_from_fedfind(ff_release, client, [args.arch]) 240​ jobs = jobs_from_fedfind(ff_release, client, [args.arch])
241 else: 241​ else:
242 jobs = jobs_from_fedfind(ff_release, client) 242​ jobs = jobs_from_fedfind(ff_release, client)
243 except TriggerException as e: 243​ except TriggerException as e:
244 logging.error("cannot run jobs: %s", e) 244​ logging.error("cannot run jobs: %s", e)
245 logging.info("planned jobs: %s", jobs) 245​ logging.info("planned jobs: %s", ' '.join(jobs))
246 if args.submit_results: 246​ if args.submit_results:
247 report_results(jobs, client) 247​ report_results(jobs, client)
248 logging.debug("finished") 248​ logging.debug("finished")
249 sys.exit() 249​ sys.exit()
250 250​
251 251​
252def run_all(args, client, wiki=None): 252​def run_all(args, client, wiki=None):
253 """Do everything we can: test current validation event compose if 253​ """Do everything we can: test current validation event compose if
254 it's new, amd test both Rawhide and Branched nightlies if they 254​ it's new, amd test both Rawhide and Branched nightlies if they
255 exist and aren't the same as the 'current' compose. 255​ exist and aren't the same as the 'current' compose.
256 """ 256​ """
257 skip = '' 257​ skip = ''
258 logging.info("running all") 258​ logging.info("running all")
259 259​
260 # Run for 'current' validation event. 260​ # Run for 'current' validation event.
261 logging.debug("running for current") 261​ logging.debug("running for current")
262 (jobs, currev) = jobs_from_current(wiki, client) 262​ (jobs, currev) = jobs_from_current(wiki, client)
263 logging.info("jobs from current validation event: %s", jobs) 263​ logging.info("jobs from current validation event: %s", ' '.join(jobs))
264 264​
265 utcdate = datetime.datetime.utcnow() 265​ utcdate = datetime.datetime.utcnow()
266 if args.yesterday: 266​ if args.yesterday:
267 utcdate = utcdate - datetime.timedelta(days=1) 267​ utcdate = utcdate - datetime.timedelta(days=1)
268 if currev and currev.compose == utcdate.strftime('%Y%m%d'): 268​ if currev and currev.compose == utcdate.strftime('%Y%m%d'):
269 # Don't schedule tests for the same compose as both "today's 269​ # Don't schedule tests for the same compose as both "today's
270 # nightly" and "current validation event" 270​ # nightly" and "current validation event"
271 skip = currev.milestone 271​ skip = currev.milestone
272 logging.debug("skipping %s because it's both today's and current validation event", skip) 272​ logging.debug("skipping %s because it's both today's and current validation event", skip)
273 273​
274 # Run for day's Rawhide nightly (if not same as current event.) 274​ # Run for day's Rawhide nightly (if not same as current event.)
275 if skip.lower() != 'rawhide': 275​ if skip.lower() != 'rawhide':
276 try: 276​ try:
277 logging.debug("running for rawhide") 277​ logging.debug("running for rawhide")
278 rawhide_ffrel = fedfind.release.get_release(release='Rawhide', compose=utcdate) 278​ rawhide_ffrel = fedfind.release.get_release(release='Rawhide', compose=utcdate)
279 rawjobs = jobs_from_fedfind(rawhide_ffrel, client) 279​ rawjobs = jobs_from_fedfind(rawhide_ffrel, client)
280 logging.info("jobs from rawhide %s: %s", rawhide_ffrel.version, rawjobs) 280​ logging.info("jobs from rawhide %s: %s", rawhide_ffrel.version, ' '.join(rawjobs))
281 jobs.extend(rawjobs) 281​ jobs.extend(rawjobs)
282 except ValueError as err: 282​ except ValueError as err:
283 logging.error("rawhide image discovery failed: %s", err) 283​ logging.error("rawhide image discovery failed: %s", err)
284 except TriggerException as e: 284​ except TriggerException as e:
285 logging.error("cannot run jobs: %s", e) 285​ logging.error("cannot run jobs: %s", e)
286 286​
287 # Run for day's Branched nightly (if not same as current event.) 287​ # Run for day's Branched nightly (if not same as current event.)
288 # We must guess a release for Branched, fedfind cannot do so. Best 288​ # We must guess a release for Branched, fedfind cannot do so. Best
289 # guess we can make is the same as the 'current' validation event 289​ # guess we can make is the same as the 'current' validation event
290 # compose (this is why we have jobs_from_current return currev). 290​ # compose (this is why we have jobs_from_current return currev).
291 if skip.lower() != 'branched': 291​ if skip.lower() != 'branched':
292 try: 292​ try:
293 logging.debug("running for branched") 293​ logging.debug("running for branched")
294 branched_ffrel = fedfind.release.get_release(release=currev.release, 294​ branched_ffrel = fedfind.release.get_release(release=currev.release,
295 milestone='Branched', compose=utcdate) 295​ milestone='Branched', compose=utcdate)
296 branchjobs = jobs_from_fedfind(branched_ffrel, client) 296​ branchjobs = jobs_from_fedfind(branched_ffrel, client)
297 logging.info("jobs from %s: %s", branched_ffrel.version, branchjobs) 297​ logging.info("jobs from %s: %s", branched_ffrel.version, ' '.join(branchjobs))
298 jobs.extend(branchjobs) 298​ jobs.extend(branchjobs)
299 except ValueError as err: 299​ except ValueError as err:
300 logging.error("branched image discovery failed: %s", err) 300​ logging.error("branched image discovery failed: %s", err)
301 except TriggerException as e: 301​ except TriggerException as e:
302 logging.error("cannot run jobs: %s", e) 302​ logging.error("cannot run jobs: %s", e)
303 if jobs: 303​ if jobs:
304 logging.info("waiting for jobs: %s", jobs) 304​ logging.info("waiting for jobs: %s", jobs)
305 report_results(jobs, client) 305​ report_results(jobs, client)
▲ Show 20 Lines • Show All 92 Lines • Show Last 20 Lines