| garretraziel | |
| jskladan |
this is necessary to allow tests to use the compose tree as a
repository instead of the mirrors.
Test with D989, this is needed for that. LOCATION
openQA setting should be set for all tests.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | scheduler/fedora_openqa_schedule/schedule.py (14 lines) |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| f8b0bf3e592b | bfcd8fd60c9d | 3e7ef86cb849 | Adam Williamson | pass compose location into openQA (Show More…) | Aug 30 2016, 11:01 PM |
| Show First 20 Lines • Show All 174 Lines • ▼ Show 20 Line(s) | 174 | jobs = [job for job in jobs if | |||
|---|---|---|---|---|---|
| 175 | job.get('state') != 'cancelled' and job.get('result') != 'user_cancelled'] | 175 | job.get('state') != 'cancelled' and job.get('result') != 'user_cancelled'] | ||
| 176 | if jobs: | 176 | if jobs: | ||
| 177 | logger.info("run_openqa_jobs: Existing jobs found for asset %s flavor %s, and force " | 177 | logger.info("run_openqa_jobs: Existing jobs found for asset %s flavor %s, and force " | ||
| 178 | "not set! No jobs scheduled.", assetname, flavor) | 178 | "not set! No jobs scheduled.", assetname, flavor) | ||
| 179 | return jobs | 179 | return jobs | ||
| 180 | return [] | 180 | return [] | ||
| 181 | 181 | | |||
| 182 | 182 | | |||
| 183 | def run_openqa_jobs(param_urls, flavor, arch, subvariant, imagetype, build, force=False, extraparams=None, resultsdb_job_id=None): | 183 | def run_openqa_jobs(param_urls, flavor, arch, subvariant, imagetype, build, | ||
| 184 | location, force=False, extraparams=None, resultsdb_job_id=None): | ||||
| 184 | """# run OpenQA 'isos' job on ISO at urls from 'param_urls', with given arch | 185 | """# run OpenQA 'isos' job on ISO at urls from 'param_urls', with given arch | ||
| 185 | and a build identifier. **NOTE**: 'build' is passed to openQA as | 186 | and a build identifier. **NOTE**: 'build' is passed to openQA as | ||
| 186 | BUILD and is later retrieved and parsed by report.py for wiki | 187 | BUILD and is later retrieved and parsed by report.py for wiki | ||
| 187 | report generation. Returns list of job IDs. If force is False, | 188 | report generation. Returns list of job IDs. If force is False, | ||
| 188 | jobs will only be scheduled if there are no existing, | 189 | jobs will only be scheduled if there are no existing, | ||
| 189 | non-cancelled jobs for the same ISO and flavor. If extraparams | 190 | non-cancelled jobs for the same ISO and flavor. If extraparams | ||
| 190 | is specified, it must be a dict or something else that can be | 191 | is specified, it must be a dict or something else that can be | ||
| 191 | combined with a dict using `update`; it adds additional parameters | 192 | combined with a dict using `update`; it adds additional parameters | ||
| Show All 15 Lines | |||||
| 207 | 208 | | |||
| 208 | # starts OpenQA jobs | 209 | # starts OpenQA jobs | ||
| 209 | params = { | 210 | params = { | ||
| 210 | 'DISTRI': 'fedora', | 211 | 'DISTRI': 'fedora', | ||
| 211 | 'VERSION': build.split('-')[1], | 212 | 'VERSION': build.split('-')[1], | ||
| 212 | 'FLAVOR': flavor, | 213 | 'FLAVOR': flavor, | ||
| 213 | 'ARCH': arch, | 214 | 'ARCH': arch, | ||
| 214 | 'BUILD': build, | 215 | 'BUILD': build, | ||
| 216 | 'LOCATION': location, | ||||
| 215 | 'CURRREL': currrel, | 217 | 'CURRREL': currrel, | ||
| 216 | 'PREVREL': prevrel, | 218 | 'PREVREL': prevrel, | ||
| 217 | 'SUBVARIANT': subvariant, | 219 | 'SUBVARIANT': subvariant, | ||
| 218 | 'IMAGETYPE': imagetype | 220 | 'IMAGETYPE': imagetype | ||
| 219 | } | 221 | } | ||
| 220 | if extraparams: | 222 | if extraparams: | ||
| 221 | params.update(extraparams) | 223 | params.update(extraparams) | ||
| 222 | # mung the BUILD so this is not considered a 'real' test run | 224 | # mung the BUILD so this is not considered a 'real' test run | ||
| ▲ Show 20 Lines • Show All 93 Lines • ▼ Show 20 Line(s) | 313 | try: | |||
| 316 | job = rdb_instance.create_job(ref_url=ref_url, name=compose) | 318 | job = rdb_instance.create_job(ref_url=ref_url, name=compose) | ||
| 317 | rdb_job_id = job["id"] | 319 | rdb_job_id = job["id"] | ||
| 318 | except ResultsDBapiException as e: | 320 | except ResultsDBapiException as e: | ||
| 319 | logger.error(e) | 321 | logger.error(e) | ||
| 320 | 322 | | |||
| 321 | # schedule per-image jobs, keeping track of the highest score | 323 | # schedule per-image jobs, keeping track of the highest score | ||
| 322 | # per arch along the way | 324 | # per arch along the way | ||
| 323 | for (flavor, arch, score, param_urls, subvariant, imagetype) in images: | 325 | for (flavor, arch, score, param_urls, subvariant, imagetype) in images: | ||
| 324 | jobs.extend(run_openqa_jobs(param_urls, flavor, arch, subvariant, imagetype, compose, force=force, | 326 | jobs.extend(run_openqa_jobs(param_urls, flavor, arch, subvariant, imagetype, compose, | ||
| 325 | extraparams=extraparams, resultsdb_job_id=rdb_job_id)) | 327 | location, force=force, extraparams=extraparams, | ||
| 328 | resultsdb_job_id=rdb_job_id)) | ||||
| 326 | if score > univs.get(arch, [None, 0])[1]: | 329 | if score > univs.get(arch, [None, 0])[1]: | ||
| 327 | univs[arch] = (param_urls, score, subvariant, imagetype) | 330 | univs[arch] = (param_urls, score, subvariant, imagetype) | ||
| 328 | 331 | | |||
| 329 | # now schedule universal jobs | 332 | # now schedule universal jobs | ||
| 330 | if univs: | 333 | if univs: | ||
| 331 | for (arch, (param_urls, _, subvariant, imagetype)) in univs.items(): | 334 | for (arch, (param_urls, _, subvariant, imagetype)) in univs.items(): | ||
| 332 | # We are assuming that ISO_URL is present in param_urls. This could create problem when | 335 | # We are assuming that ISO_URL is present in param_urls. This could create problem when | ||
| 333 | # unversal tests are run on product that doesn't have ISO. OTOH, only product without ISO | 336 | # unversal tests are run on product that doesn't have ISO. OTOH, only product without ISO | ||
| 334 | # is ARM and there would be whole lot of other problems if universal tests are run on ARM. | 337 | # is ARM and there would be whole lot of other problems if universal tests are run on ARM. | ||
| 335 | logger.info("running universal tests for %s with %s", arch, param_urls['ISO_URL']) | 338 | logger.info("running universal tests for %s with %s", arch, param_urls['ISO_URL']) | ||
| 336 | jobs.extend(run_openqa_jobs(param_urls, 'universal', arch, subvariant, imagetype, compose, | 339 | jobs.extend(run_openqa_jobs(param_urls, 'universal', arch, subvariant, imagetype, | ||
| 337 | force=force, extraparams=extraparams, resultsdb_job_id=rdb_job_id)) | 340 | compose, location, force=force, extraparams=extraparams, | ||
| 341 | resultsdb_job_id=rdb_job_id)) | ||||
| 338 | 342 | | |||
| 339 | return (compose, jobs) | 343 | return (compose, jobs) | ||