Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Koschei hotfix: try not to override arch of noarch packages

Browse source
This commit is contained in:
Mikolaj Izdebski 2017-06-13 20:19:50 +00:00
parent d989d822de
commit ff4be42ff1
1 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

28
roles/koschei/backend/files/koschei-scheduler-hotfix.patch
View file

@ -1,13 +1,31 @@
--- /usr/lib/python2.7/site-packages/koschei/backend/__init__.py~ 2017-06-13 21:30:55.485685712 +0200 --- /usr/lib/python2.7/site-packages/koschei/backend/__init__.py~ 2017-06-13 21:31:05.170580184 +0200
+++ /usr/lib/python2.7/site-packages/koschei/backend/__init__.py 2017-06-13 21:32:44.862493921 +0200 +++ /usr/lib/python2.7/site-packages/koschei/backend/__init__.py 2017-06-13 22:16:19.333831662 +0200
@@ -99,8 +99,8 @@ @@ -94,13 +94,15 @@
return self._repo_cache
-def submit_build(session, package):
+def submit_build(session, package, arches=[]):
assert package.collection.latest_repo_id
build = Build(package_id=package.id, state=Build.RUNNING) build = Build(package_id=package.id, state=Build.RUNNING)
name = package.name name = package.name
build_opts = {} build_opts = {}
- if package.arch_override: - if package.arch_override:
- override = package.arch_override
+ if True: + if True:
+ override = package.arch_override or '^' override = package.arch_override
+ if not override and 'noarch' not in arches:
+ override = '^'
if override.startswith('^'): if override.startswith('^'):
excludes = override[1:].split() excludes = override[1:].split()
build_arches = get_config('koji_config').get('build_arches') build_arches = get_config('koji_config').get('build_arches')
--- /usr/lib/python2.7/site-packages/koschei/backend/services/scheduler.py~ 2017-06-13 22:15:27.907396051 +0200
+++ /usr/lib/python2.7/site-packages/koschei/backend/services/scheduler.py 2017-06-13 22:15:45.077207616 +0200
@@ -72,7 +72,7 @@
self.log.info('Scheduling build for {}, priority {}'
.format(package.name, priority))
- build = backend.submit_build(self.session, package)
+ build = backend.submit_build(self.session, package, arches)
package.current_priority = None
package.scheduler_skip_reason = None
package.manual_priority = 0