Differential D557

T602: move 'compose' logic to schedule, replace 'ifnotcurrent'
ClosedPublic
Actions

Authored by adamwill on Sep 4 2015, 12:04 AM.

Details

Reviewers
garretraziel
jskladan
Commits
rOPENQAfc6cd9553f58: T602: move 'compose' logic to schedule, replace 'ifnotcurrent'
Summary

The meat of this commit is to implement T602 - moving a lot of
the 'jobs for specific compose' logic out of the CLI module
into the schedule module, allowing for non-CLI consumers to use
it. There are various related changes bundled in.

Most significantly, 'ifnotcurrent' is replaced with a 'force'
argument that's shared by most of the schedule functions - they
all ultimately pass it to run_openqa_jobs(), which handles it.
If force is false-y, jobs will not be scheduled if there are
any existing, non-cancelled jobs for the given ISO and flavor.
This fulfills the same basic goal as 'ifnotcurrent' - making
sure scheduled nightly and current runs won't schedule jobs for
the same compose - while avoiding the need to hit up the wiki
(and hence meaning jobs_from_compose() does not need the wiki
at all) and being more generally useful, I think.

We now need the wiki only for two things: jobs_from_current()
(to find what the 'current' compose *is*) and, obviously, result
reporting.

There's a more minor change to how arches are handled. The
ARCHES constant is a tuple not a list now (I did this because
it was the default value for an optional function argument and
those shouldn't be mutable; then I made it not the default
value any more, but keeping it as a tuple seems appropriate
anyway). jobs_from_fedfind() has arches=None as the default
and takes the list from the constant if arches isn't set; that
lets us clean things up in cli.py rather a bit.

There's a bit of a bugfix in the CLI to job reporting - we
weren't passing in the CLI wiki object or 'submit' value
properly for 'current' or 'compose', only for 'report'. I also
tried to clean up the logging a bit in general.

Test Plan

Check that all commands work as before, except that
you can pass a list of arches now (practically makes no real
difference ATM since we only have two) and --force replaces
--ifnotcurrent with the impact described in the commit msg.

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 T602: move 'compose' logic to schedule, replace 'ifnotcurrent'.Sep 4 2015, 12:04 AM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: jskladan, garretraziel.
adamwill added a comment.Sep 4 2015, 12:04 AM
NOTE: I did this on top of D556, since that helps simplify this.
garretraziel accepted this revision.Sep 4 2015, 2:26 PM

Ok, this LGTM.

This revision is now accepted and ready to land.Sep 4 2015, 2:26 PM
Closed by commit rOPENQAfc6cd9553f58: T602: move 'compose' logic to schedule, replace 'ifnotcurrent' (authored by adamwill). · Explain WhySep 5 2015, 9:42 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1452

View Options

fedora_openqa_schedule/cli.py

Show All 23 Lines
24"""CLI module for fedora-openqa-schedule.""" 24​"""CLI module for fedora-openqa-schedule."""
25 25​
26# Standard libraries 26​# Standard libraries
27import argparse 27​import argparse
28import logging 28​import logging
29import sys 29​import sys
30 30​
31# External dependencies 31​# External dependencies
32import fedfind.exceptions ​
33import fedfind.release ​
34# We can at least find images and run OpenQA jobs without wikitcms 32​# We can at least find images and run OpenQA jobs without wikitcms
35try: 33​try:
36 import wikitcms.wiki 34​ import wikitcms.wiki
37except ImportError: 35​except ImportError:
38 wikitcms = None 36​ wikitcms = None
39 37​
40# Internal dependencies 38​# Internal dependencies
41import fedora_openqa_schedule.schedule as schedule 39​import fedora_openqa_schedule.schedule as schedule
42import fedora_openqa_schedule.report as report 40​import fedora_openqa_schedule.report as report
43from fedora_openqa_schedule.config import CONFIG 41​from fedora_openqa_schedule.config import CONFIG
44 42​
45logger = logging.getLogger(__name__) 43​logger = logging.getLogger(__name__)
46 44​
47### SUB-COMMAND METHODS 45​### SUB-COMMAND METHODS
48 46​
49def command_compose(args, wiki): 47​def command_compose(args, wiki):
50 """run OpenQA on a specified compose, optionally reporting 48​ """run OpenQA on a specified compose, optionally reporting
51 results if a matching wikitcms ValidationEvent is found by 49​ results if a matching wikitcms ValidationEvent is found by
52 relval/wikitcms. 50​ relval/wikitcms.
53 """ 51​ """
54 # get the fedfind release object ​
55 try: 52​ try:
56 logger.debug("querying fedfind on specific compose: %s %s %s", args.release, 53​ jobs = schedule.jobs_from_compose(
57 args.milestone, args.compose) 54​ args.release, args.milestone, args.compose, arches=args.arch, force=args.force,
58 ff_release = fedfind.release.get_release(release=args.release, 55​ wait=args.wait)
59 milestone=args.milestone, 56​
60 compose=args.compose) ​
61 except ValueError as err: 57​ except ValueError as err:
62 logger.critical("compose %s %s %s was not found", args.release, 58​ logger.critical("Could not find compose %s %s %s! Error: %s",
63 args.milestone, args.compose) 59​ args.release, args.milestone, args.compose, err)
64 sys.exit(err[0]) 60​ sys.exit(1)
65 61​
66 logger.info("running on compose: %s", ff_release.version) 62​ except schedule.TriggerException as err:
67 63​ logger.warning("No jobs run! Compose may not exist? %s", err)
68 if args.ifnotcurrent: ​
69 try: ​
70 currev = wiki.current_event ​
71 # Compare currev's fedfind release version with ours ​
72 if currev.ff_release.version == ff_release.version: ​
73 logger.info("Compose is the current validation compose. Exiting.") ​
74 sys.exit() ​
75 except AttributeError: ​
76 sys.exit("Wikitcms is required for --ifnotcurrent.") ​
77 ​
78 if args.wait: ​
79 logger.info("Waiting up to %s mins for compose", str(args.wait)) ​
80 try: ​
81 ff_release.wait(waittime=args.wait) ​
82 except fedfind.exceptions.WaitError: ​
83 sys.exit("Waited too long for compose to appear!") ​
84 ​
85 jobs = [] ​
86 try: ​
87 if args.arch: ​
88 jobs = schedule.jobs_from_fedfind(ff_release, [args.arch]) ​
89 else: ​
90 jobs = schedule.jobs_from_fedfind(ff_release) ​
91 except schedule.TriggerException as e: ​
92 logger.debug("No jobs run: %s", e) ​
93 sys.exit(1) 64​ sys.exit(1)
94 logger.info("planned jobs: %s", ' '.join(str(j) for j in jobs)) 65​
95 if args.submit_results: 66​ except schedule.WaitError:
96 report.report_results(jobs) 67​ logger.critical("Waited too long for compose to appear!")
68​ sys.exit(1)
69​
70​ if jobs:
71​ report.report_results(jobs, wiki=wiki, report=args.submit)
72​ else:
73​ msg = "No jobs run!"
74​ if not args.force:
75​ msg = "{0} {1}".format(
76​ msg, "You did not pass --force: maybe jobs exist for all ISOs/flavors")
77​ logger.warning(msg)
78​ sys.exit(1)
79​
97 logger.debug("finished") 80​ logger.debug("finished")
98 sys.exit() 81​ sys.exit()
99 82​
100def command_current(args, wiki): 83​def command_current(args, wiki):
101 """run OpenQA for current release validation event, if we have 84​ """run OpenQA for current release validation event, if we have
102 not already done it. 85​ not already done it.
103 """ 86​ """
104 logger.info("running on current release") 87​ logger.info("running on current release")
105 try: 88​ try:
106 jobs = schedule.jobs_from_current(wiki) 89​ jobs = schedule.jobs_from_current(wiki)
107 except schedule.TriggerException as e: 90​ except schedule.TriggerException as e:
108 logger.debug("No jobs run: %s", e) 91​ logger.debug("No jobs run: %s", e)
109 sys.exit(1) 92​ sys.exit(1)
110 # wait for jobs to finish and display results 93​ # wait for jobs to finish and display results
111 if jobs: 94​ if jobs:
112 logger.info("waiting for jobs: %s", ' '.join(str(j) for j in jobs)) 95​ logger.info("waiting for jobs: %s", ' '.join(str(j) for j in jobs))
113 report.report_results(jobs) 96​ report.report_results(jobs, wiki=wiki, report=args.submit)
114 logger.debug("finished") 97​ logger.debug("finished")
115 sys.exit() 98​ sys.exit()
116 99​
117def command_report(args, wiki): 100​def command_report(args, wiki):
118 """Map a list of openQA job IDs to Wikitcms test results, and 101​ """Map a list of openQA job IDs to Wikitcms test results, and
119 either display the ResTups for inspection or report the 102​ either display the ResTups for inspection or report the
120 results to the wiki. 103​ results to the wiki.
121 """ 104​ """
Show All 20 Lines124 else:
142 logging.basicConfig(level=loglevel) 125​ logging.basicConfig(level=loglevel)
143 126​
144 wiki = None 127​ wiki = None
145 if args.test: 128​ if args.test:
146 logger.debug("using test wiki") 129​ logger.debug("using test wiki")
147 if wikitcms: 130​ if wikitcms:
148 wiki = wikitcms.wiki.Wiki(('https', 'stg.fedoraproject.org'), '/w/') 131​ wiki = wikitcms.wiki.Wiki(('https', 'stg.fedoraproject.org'), '/w/')
149 else: 132​ else:
150 logger.warn("wikitcms not found, reporting to wiki disabled") 133​ logger.warning("wikitcms not found, reporting to wiki disabled")
151 else: 134​ else:
152 if wikitcms: 135​ if wikitcms:
153 wiki = wikitcms.wiki.Wiki(('https', 'fedoraproject.org'), '/w/') 136​ wiki = wikitcms.wiki.Wiki(('https', 'fedoraproject.org'), '/w/')
154 else: 137​ else:
155 logger.warn("wikitcms not found, reporting to wiki disabled") 138​ logger.warning("wikitcms not found, reporting to wiki disabled")
156 139​
157 args.func(args, wiki) 140​ args.func(args, wiki)
158 141​
159def parse_args(): 142​def parse_args():
160 """Parse arguments with argparse.""" 143​ """Parse arguments with argparse."""
161 test_help = "Operate on the staging wiki (for testing)" 144​ test_help = "Operate on the staging wiki (for testing)"
162 parser = argparse.ArgumentParser(description=( 145​ parser = argparse.ArgumentParser(description=(
163 "Run OpenQA tests for a release validation test event.")) 146​ "Run OpenQA tests for a release validation test event."))
Show All 14 Lines
178 parser_compose.add_argument( 161​ parser_compose.add_argument(
179 '--milestone', '-m', help="The milestone to operate on (Alpha, Beta, Final, Branched, " 162​ '--milestone', '-m', help="The milestone to operate on (Alpha, Beta, Final, Branched, "
180 "Rawhide). Must be specified for a TC/RC; for a nightly, will be guessed if not " 163​ "Rawhide). Must be specified for a TC/RC; for a nightly, will be guessed if not "
181 "specified", choices=['Alpha', 'Beta', 'Final', 'Branched', 'Rawhide']) 164​ "specified", choices=['Alpha', 'Beta', 'Final', 'Branched', 'Rawhide'])
182 parser_compose.add_argument( 165​ parser_compose.add_argument(
183 '--compose', '-c', help="The version to run for; either the compose (for a TC/RC), or " 166​ '--compose', '-c', help="The version to run for; either the compose (for a TC/RC), or "
184 "the date (for a nightly build)", metavar="{T,R}C1-19 or YYYYMMDD") 167​ "the date (for a nightly build)", metavar="{T,R}C1-19 or YYYYMMDD")
185 parser_compose.add_argument( 168​ parser_compose.add_argument(
186 '--arch', '-a', help="The arch to run for", choices=('x86_64', 'i386')) 169​ '--arch', '-a', help="The arch to run for", nargs='+',
170​ choices=('x86_64', 'i386'))
187 parser_compose.add_argument( 171​ parser_compose.add_argument(
188 '--wait', '-w', help="Wait NNN minutes for the compose to appear, if it doesn't yet " 172​ '--wait', '-w', help="Wait NNN minutes for the compose to appear, if it doesn't yet "
189 "exist", default=CONFIG.getint('schedule', 'compose-wait'), type=int, metavar="NNN") 173​ "exist", type=int, metavar="NNN")
190 parser_compose.add_argument( 174​ parser_compose.add_argument(
191 '--ifnotcurrent', '-i', help="Only run if the compose is not the 'current' validation " 175​ '--force', '-f', help="For each ISO/flavor combination, schedule jobs even if there "
192 "compose. Mainly intended for cron runs on nightly builds, to avoid duplicating jobs " 176​ "are existing, non-cancelled jobs for that combination", action='store_true')
193 "run by a 'current' cron job. Requires wikitcms", action='store_true') ​
194 parser_compose.set_defaults(func=command_compose) 177​ parser_compose.set_defaults(func=command_compose)
195 178​
196 parser_report = subparsers.add_parser( 179​ parser_report = subparsers.add_parser(
197 'report', description="Map openQA job results to Wikitcms test results and optionally " 180​ 'report', description="Map openQA job results to Wikitcms test results and optionally "
198 "submit them to the wiki") 181​ "submit them to the wiki")
199 parser_report.add_argument('jobs', type=int, nargs='+') 182​ parser_report.add_argument('jobs', type=int, nargs='+')
200 parser_report.set_defaults(func=command_report) 183​ parser_report.set_defaults(func=command_report)
201 184​
Show All 32 Lines
View Options

fedora_openqa_schedule/schedule.py

Show All 34 Lines
35import urlgrabber 35​import urlgrabber
36 36​
37# Internal dependencies 37​# Internal dependencies
38from fedora_openqa_schedule.config import CONFIG 38​from fedora_openqa_schedule.config import CONFIG
39 39​
40logger = logging.getLogger(__name__) 40​logger = logging.getLogger(__name__)
41 41​
42PERSISTENT = "/var/tmp/openqa_watcher.json" 42​PERSISTENT = "/var/tmp/openqa_watcher.json"
43ARCHES = ['x86_64', 'i386'] 43​ARCHES = ('x86_64', 'i386')
44# Default value is '/var/lib/openqa/factory/iso/' 44​# Default value is '/var/lib/openqa/factory/iso/'
45ISO_PATH = CONFIG.get('schedule', 'iso-path') 45​ISO_PATH = CONFIG.get('schedule', 'iso-path')
46 46​
47class TriggerException(Exception): 47​class TriggerException(Exception):
48 pass 48​ pass
49 49​
50​class WaitError(Exception):
51​ """Raised when we waited for something too long."""
52​ pass
53​
50def read_last(): 54​def read_last():
51 """Read last tested version from file.""" 55​ """Read last tested version from file."""
52 logger.debug("reading latest checked version from %s", PERSISTENT) 56​ logger.debug("reading latest checked version from %s", PERSISTENT)
53 result = {} 57​ result = {}
54 try: 58​ try:
55 f = open(PERSISTENT, "r") 59​ f = open(PERSISTENT, "r")
56 json_raw = f.read() 60​ json_raw = f.read()
57 f.close() 61​ f.close()
Show All 23 Lines83 if not os.path.isfile(filename):
81 # Icky hack around a urlgrabber bug: 85​ # Icky hack around a urlgrabber bug:
82 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=715416 86​ # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=715416
83 urlgrabber.urlgrab(image.url.replace('https', 'http'), filename) 87​ urlgrabber.urlgrab(image.url.replace('https', 'http'), filename)
84 else: 88​ else:
85 logger.info("%s already exists", filename) 89​ logger.info("%s already exists", filename)
86 return isoname 90​ return isoname
87 91​
88 92​
89def run_openqa_jobs(isoname, flavor, arch, build): 93​def run_openqa_jobs(isoname, flavor, arch, build, force=False):
90 """# run OpenQA 'isos' job on selected isoname, with given arch 94​ """# run OpenQA 'isos' job on selected isoname, with given arch
91 and a version string. **NOTE**: the version passed to OpenQA as 95​ and a version string. **NOTE**: the version passed to OpenQA as
92 BUILD and is parsed back into the 'relval report-auto' arguments 96​ BUILD and is parsed back into the 'relval report-auto' arguments
93 by report_job_results.py; it is expected to be in the form of a 97​ by report_job_results.py; it is expected to be in the form of a
94 3-tuple on which join('_') has been run, and the three elements 98​ 3-tuple on which join('_') has been run, and the three elements
95 will be passed as release, compose and milestone. Returns list of 99​ will be passed as release, compose and milestone. Returns list of
96 job IDs. 100​ job IDs. If force is False, jobs will only be scheduled if there
101​ are no existing, non-cancelled jobs for the same ISO and flavor.
97 """ 102​ """
98 logger.info("sending jobs on OpenQA") 103​ logger.info("sending jobs on OpenQA")
99 104​
100 # starts OpenQA jobs 105​ # starts OpenQA jobs
101 params = { 106​ params = {
102 'ISO': isoname, 107​ 'ISO': isoname,
103 'DISTRI': 'fedora', 108​ 'DISTRI': 'fedora',
104 'VERSION': build.split('_')[0], 109​ 'VERSION': build.split('_')[0],
105 'FLAVOR': flavor, 110​ 'FLAVOR': flavor,
106 'ARCH': arch, 111​ 'ARCH': arch,
107 'BUILD': build 112​ 'BUILD': build
108 } 113​ }
109 client = OpenQA_Client() 114​ client = OpenQA_Client()
110 output = client.openqa_request('POST', 'isos', params) 115​ if not force:
116​ # Check if we have any existing non-cancelled jobs for this
117​ # ISO and flavor (checking flavor is important otherwise we'd
118​ # bail on doing the per-ISO jobs for the ISO we use for the
119​ # 'universal' tests).
120​ jobs = client.openqa_request('GET', 'jobs', params={'iso': isoname})['jobs']
121​ jobs = [job for job in jobs if job['settings']['FLAVOR'] == flavor]
122​ jobs = [job for job in jobs if
123​ job.get('state') != 'cancelled' and job.get('result') != 'user_cancelled']
124​ if jobs:
125​ logger.info("run_openqa_jobs: Existing jobs found for ISO %s flavor %s, and force "
126​ "not set! No jobs scheduled.", isoname, flavor)
127​ logger.debug("Existing jobs found: %s", ' '.join(str(job['id']) for job in jobs))
128​ return []
111 129​
112 logger.debug("executed") 130​ output = client.openqa_request('POST', 'isos', params)
113 logger.info("planned jobs: %s", output["ids"]) 131​ logger.debug("run_openqa_jobs: executed")
132​ logger.debug("run_openqa_jobs: planned jobs: %s", output["ids"])
114 133​
115 return output["ids"] 134​ return output["ids"]
116 135​
117 136​
118def jobs_from_current(wiki): 137​def jobs_from_current(wiki, force=False):
119 """Schedule jobs against the 'current' release validation event 138​ """Schedule jobs against the 'current' release validation event
120 (according to wikitcms) if we have not already. Returns the job 139​ (according to wikitcms) if we have not already. Returns the job
121 list. 140​ list. If force is False, for each ISO, jobs will only be scheduled
141​ if there are no existing, non-cancelled jobs for the same ISO and
142​ flavor.
122 """ 143​ """
123 if not wiki: 144​ if not wiki:
124 logger.warning("python-wikitcms is required for current validation event discovery.") 145​ logger.warning("python-wikitcms is required for current validation event discovery.")
125 return ([], None) 146​ return ([], None)
126 last_versions, json_parsed = read_last() 147​ last_versions, json_parsed = read_last()
127 currev = wiki.current_event 148​ currev = wiki.current_event
128 logger.info("current event: %s", currev.version) 149​ logger.info("current event: %s", currev.version)
129 runarches = [] 150​ runarches = []
130 for arch in ARCHES: 151​ for arch in ARCHES:
131 last_version = last_versions.get(arch, None) 152​ last_version = last_versions.get(arch, None)
132 if last_version and last_version >= currev.sortname: 153​ if last_version and last_version >= currev.sortname:
133 logger.info("skipped: %s: %s is newer or equal to %s", 154​ logger.info("skipped: %s: %s is newer or equal to %s",
134 arch, last_version, currev.sortname) 155​ arch, last_version, currev.sortname)
135 else: 156​ else:
136 runarches.append(arch) 157​ runarches.append(arch)
137 logger.debug("%s will be tested in version %s", arch, currev.sortname) 158​ logger.debug("%s will be tested in version %s", arch, currev.sortname)
138 json_parsed[arch] = currev.sortname 159​ json_parsed[arch] = currev.sortname
139 160​
140 jobs = [] 161​ jobs = []
141 162​
142 if not runarches: 163​ if not runarches:
143 raise TriggerException("Skipped all arches, nothing to do.") 164​ raise TriggerException("Skipped all arches, nothing to do.")
144 165​
145 jobs = jobs_from_fedfind(currev.ff_release, runarches) 166​ jobs = jobs_from_fedfind(currev.ff_release, arches=runarches, force=force)
146 logger.info("planned jobs: %s", ' '.join(str(j) for j in jobs)) 167​ logger.info("jobs_from_current: planned jobs: %s", ' '.join(str(j) for j in jobs))
147 168​
148 # write info about latest versions 169​ # write info about latest versions
149 f = open(PERSISTENT, "w") 170​ f = open(PERSISTENT, "w")
150 f.write(json.dumps(json_parsed)) 171​ f.write(json.dumps(json_parsed))
151 f.close() 172​ f.close()
152 logger.debug("written info about newest version") 173​ logger.debug("written info about newest version")
153 174​
154 return jobs 175​ return jobs
155 176​
156 177​
157def jobs_from_fedfind(ff_release, arches=ARCHES): 178​def jobs_from_compose(release='', milestone='', compose='', arches=None, force=False, wait=None):
179​ """Schedule jobs against a specific release/compose. Returns the
180​ list of job IDs.
181​
182​ 'release', 'milestone' and 'compose' identify a release according
183​ to fedfind conventions (e.g. '23', 'Beta', 'TC2' or '24',
184​ 'Branched', '20160301'). A ValueError may be raised (by fedfind)
185​ if there is something wrong with these values.
186​
187​ arches may be an iterable of arches to run on. If not specified,
188​ the default ARCHES will be used.
189​
190​ If force is False, for each ISO, jobs will only be scheduled if
191​ there are no existing, non-cancelled jobs for the same ISO and
192​ flavor.
193​
194​ 'wait' is a number of minutes to wait for the compose to appear
195​ before scheduling the jobs; if None, the value will be read from
196​ configuration (see config.py for default). Will raise WaitError if
197​ the compose cannot be found after the wait period. If wait is 0,
198​ jobs_from_fedfind will raise TriggerException if the compose does
199​ not exist.
200​ """
201​ # Get the fedfind release object.
202​ logger.debug("jobs_from_compose: querying fedfind for compose: %s %s %s", release,
203​ milestone, compose)
204​ ff_release = fedfind.release.get_release(release=release, milestone=milestone,
205​ compose=compose)
206​ logger.info("jobs_from_compose: running on compose: %s", ff_release.version)
207​
208​ if wait is None:
209​ wait = CONFIG.getint('schedule', 'compose-wait')
210​ if wait:
211​ logger.info("jobs_from_compose: Waiting up to %s mins for compose", str(wait))
212​ try:
213​ ff_release.wait(waittime=wait)
214​ except fedfind.exceptions.WaitError as err:
215​ raise WaitError(err)
216​
217​ jobs = jobs_from_fedfind(ff_release, arches=arches, force=force)
218​ logger.info("jobs_from_compose: planned jobs: %s", ' '.join(str(j) for j in jobs))
219​ return jobs
220​
221​
222​def jobs_from_fedfind(ff_release, arches=None, force=False):
158 """Given a fedfind.Release object, find the ISOs we want and run 223​ """Given a fedfind.Release object, find the ISOs we want and run
159 jobs on them. arches is an iterable of arches to run on, if not 224​ jobs on them. arches is an iterable of arches to run on, if not
160 specified, we'll use our constant. 225​ specified, we'll use ARCHES (defined above). If force is False,
226​ for each ISO, jobs will only be scheduled if there are no
227​ existing, non-cancelled jobs for the same ISO and flavor.
161 """ 228​ """
229​ if not arches:
230​ arches = ARCHES
162 # Find currently-testable images for our arches. 231​ # Find currently-testable images for our arches.
163 jobs = [] 232​ jobs = []
164 queries = ( 233​ queries = (
165 fedfind.release.Query('imagetype', ('boot', 'live')), 234​ fedfind.release.Query('imagetype', ('boot', 'live')),
166 fedfind.release.Query('arch', arches), 235​ fedfind.release.Query('arch', arches),
167 fedfind.release.Query('payload', ('server', 'generic', 'workstation'))) 236​ fedfind.release.Query('payload', ('server', 'generic', 'workstation')))
168 logger.debug("querying fedfind for images") 237​ logger.debug("querying fedfind for images")
169 images = ff_release.find_images(queries) 238​ images = ff_release.find_images(queries)
Show All 35 Lines263 for img in okimgs:
205 if score > bestscore: 274​ if score > bestscore:
206 bestimg = img 275​ bestimg = img
207 bestscore = score 276​ bestscore = score
208 if not bestimg: 277​ if not bestimg:
209 logger.warn("no universal tests image found for %s", arch) 278​ logger.warn("no universal tests image found for %s", arch)
210 continue 279​ continue
211 logger.info("running universal tests for %s with %s", arch, bestimg.desc) 280​ logger.info("running universal tests for %s with %s", arch, bestimg.desc)
212 isoname = download_image(bestimg) 281​ isoname = download_image(bestimg)
213 job_ids = run_openqa_jobs(isoname, 'universal', arch, build) 282​ job_ids = run_openqa_jobs(isoname, 'universal', arch, build, force=force)
214 jobs.extend(job_ids) 283​ jobs.extend(job_ids)
215 284​
216 # Now schedule per-image jobs. 285​ # Now schedule per-image jobs.
217 for image in images: 286​ for image in images:
218 isoname = download_image(image) 287​ isoname = download_image(image)
219 flavor = '_'.join((image.payload, image.imagetype)) 288​ flavor = '_'.join((image.payload, image.imagetype))
220 job_ids = run_openqa_jobs(isoname, flavor, image.arch, build) 289​ job_ids = run_openqa_jobs(isoname, flavor, image.arch, build, force=force)
221 jobs.extend(job_ids) 290​ jobs.extend(job_ids)
222 return jobs 291​ return jobs