fix previous commit: job IDs are ints not strs

Forgot to fix this up before landing. As landed it didn't work
because job IDs are ints not strs.
This commit is contained in:
Adam Williamson 2015-08-10 11:14:37 -07:00
parent 836dec71fe
commit f681dce47e

View File

@ -120,7 +120,7 @@ def jobs_from_current(wiki, client):
try: try:
jobs = jobs_from_fedfind(currev.ff_release, client, runarches) jobs = jobs_from_fedfind(currev.ff_release, client, runarches)
logging.info("planned jobs: %s", ' '.join(jobs)) logging.info("planned jobs: %s", ' '.join(str(j) for j in jobs))
# write info about latest versions # write info about latest versions
f = open(PERSISTENT, "w") f = open(PERSISTENT, "w")
@ -212,7 +212,7 @@ def run_current(args, client, wiki):
jobs, _ = jobs_from_current(wiki, client) jobs, _ = jobs_from_current(wiki, client)
# wait for jobs to finish and display results # wait for jobs to finish and display results
if jobs: if jobs:
logging.info("waiting for jobs: %s", ' '.join(jobs)) logging.info("waiting for jobs: %s", ' '.join(str(j) for j in jobs))
report_results(jobs, client) report_results(jobs, client)
logging.debug("finished") logging.debug("finished")
sys.exit() sys.exit()
@ -242,7 +242,7 @@ def run_compose(args, client, wiki=None):
jobs = jobs_from_fedfind(ff_release, client) jobs = jobs_from_fedfind(ff_release, client)
except TriggerException as e: except TriggerException as e:
logging.error("cannot run jobs: %s", e) logging.error("cannot run jobs: %s", e)
logging.info("planned jobs: %s", ' '.join(jobs)) logging.info("planned jobs: %s", ' '.join(str(j) for j in jobs))
if args.submit_results: if args.submit_results:
report_results(jobs, client) report_results(jobs, client)
logging.debug("finished") logging.debug("finished")
@ -260,7 +260,7 @@ def run_all(args, client, wiki=None):
# Run for 'current' validation event. # Run for 'current' validation event.
logging.debug("running for current") logging.debug("running for current")
(jobs, currev) = jobs_from_current(wiki, client) (jobs, currev) = jobs_from_current(wiki, client)
logging.info("jobs from current validation event: %s", ' '.join(jobs)) logging.info("jobs from current validation event: %s", ' '.join(str(j) for j in jobs))
utcdate = datetime.datetime.utcnow() utcdate = datetime.datetime.utcnow()
if args.yesterday: if args.yesterday:
@ -277,7 +277,7 @@ def run_all(args, client, wiki=None):
logging.debug("running for rawhide") logging.debug("running for rawhide")
rawhide_ffrel = fedfind.release.get_release(release='Rawhide', compose=utcdate) rawhide_ffrel = fedfind.release.get_release(release='Rawhide', compose=utcdate)
rawjobs = jobs_from_fedfind(rawhide_ffrel, client) rawjobs = jobs_from_fedfind(rawhide_ffrel, client)
logging.info("jobs from rawhide %s: %s", rawhide_ffrel.version, ' '.join(rawjobs)) logging.info("jobs from rawhide %s: %s", rawhide_ffrel.version, ' '.join(str(j) for j in rawjobs))
jobs.extend(rawjobs) jobs.extend(rawjobs)
except ValueError as err: except ValueError as err:
logging.error("rawhide image discovery failed: %s", err) logging.error("rawhide image discovery failed: %s", err)
@ -294,7 +294,7 @@ def run_all(args, client, wiki=None):
branched_ffrel = fedfind.release.get_release(release=currev.release, branched_ffrel = fedfind.release.get_release(release=currev.release,
milestone='Branched', compose=utcdate) milestone='Branched', compose=utcdate)
branchjobs = jobs_from_fedfind(branched_ffrel, client) branchjobs = jobs_from_fedfind(branched_ffrel, client)
logging.info("jobs from %s: %s", branched_ffrel.version, ' '.join(branchjobs)) logging.info("jobs from %s: %s", branched_ffrel.version, ' '.join(str(j) for j in branchjobs))
jobs.extend(branchjobs) jobs.extend(branchjobs)
except ValueError as err: except ValueError as err:
logging.error("branched image discovery failed: %s", err) logging.error("branched image discovery failed: %s", err)